http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java index 8c743f6..b739318 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java @@ -57,7 +57,7 @@ public class GridCacheMultiNodeDataStructureTest { * @throws IgniteCheckedException If failed. */ private static void sample(Ignite g, String cacheName) throws IgniteCheckedException { - Cache<Long, Object> cache = g.cache(cacheName); + GridCache<Long, Object> cache = g.cache(cacheName); CacheAtomicLong atomicLong = cache.dataStructures().atomicLong("keygen", 0, true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 2b8b06e..a480880 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -278,7 +278,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon info("Queue name: " + queueName); - Cache c = grid(0).cache(null); + GridCache c = grid(0).cache(null); CacheQueue<Integer> queue = c.dataStructures().queue(queueName, QUEUE_CAPACITY, false, true); @@ -372,7 +372,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon futs.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { - Cache cache = grid(idx).cache(null); + GridCache cache = grid(idx).cache(null); CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true); @@ -387,7 +387,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon for (IgniteFuture fut : futs) fut.get(); - Cache cache = grid(0).cache(null); + GridCache cache = grid(0).cache(null); CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true); @@ -443,7 +443,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon putFuts.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { - Cache cache = grid(idx).cache(null); + GridCache cache = grid(idx).cache(null); CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true); @@ -461,7 +461,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon pollFuts.add(GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - Cache cache = grid(idx).cache(null); + GridCache cache = grid(idx).cache(null); CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true); @@ -487,7 +487,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon for (IgniteFuture fut : pollFuts) fut.get(); - Cache cache = grid(0).cache(null); + GridCache cache = grid(0).cache(null); CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index b1751d5..f92a963 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -679,7 +679,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf futs.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { - Cache cache = grid(idx).cache(null); + GridCache cache = grid(idx).cache(null); CacheSet<Integer> set = cache.dataStructures().set(SET_NAME, collocated, false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 97b69fd..63aaf60 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -96,7 +96,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon info("Started grid: " + locNodeId); - Cache<String, ?> cache = ignite.cache(null); + GridCache<String, ?> cache = ignite.cache(null); info("Creating queue: " + locNodeId); @@ -155,7 +155,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon // If output presents, test passes with greater probability. // info("Start puts."); - Cache<Integer, String> cache = ignite.cache(null); + GridCache<Integer, String> cache = ignite.cache(null); info("Partition: " + cache.affinity().partition(1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index 28677d0..61c4ff2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -40,13 +40,13 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend protected static Ignite[] ignites; /** Regular caches. */ - private static Cache<Integer, Object>[] caches; + private static GridCache<Integer, Object>[] caches; /** Offheap values caches. */ - private static Cache<Integer, Object>[] cachesOffheap; + private static GridCache<Integer, Object>[] cachesOffheap; /** Offheap tiered caches. */ - private static Cache<Integer, Object>[] cachesOffheapTiered; + private static GridCache<Integer, Object>[] cachesOffheapTiered; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -142,9 +142,9 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend ignites = new Ignite[gridCnt]; - caches = new Cache[gridCnt]; - cachesOffheap = new Cache[gridCnt]; - cachesOffheapTiered = new Cache[gridCnt]; + caches = new GridCache[gridCnt]; + cachesOffheap = new GridCache[gridCnt]; + cachesOffheapTiered = new GridCache[gridCnt]; for (int i = 0; i < gridCnt; i++) { ignites[i] = startGrid(i); @@ -280,14 +280,14 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @throws Exception If failed. */ public void testSwap() throws Exception { - for (Cache<Integer, Object> cache : caches) + for (GridCache<Integer, Object> cache : caches) assert cache.configuration().isSwapEnabled(); byte[] val1 = wrap(1); - Cache<Integer, Object> primaryCache = null; + GridCache<Integer, Object> primaryCache = null; - for (Cache<Integer, Object> cache : caches) { + for (GridCache<Integer, Object> cache : caches) { if (cache.entry(SWAP_TEST_KEY).primary()) { primaryCache = cache; @@ -317,7 +317,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val Value. * @throws Exception If failed. */ - private void testTransaction0(Cache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, + private void testTransaction0(GridCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed0(caches, concurrency, key, val, null, null); } @@ -333,9 +333,9 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed0(Cache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, + private void testTransactionMixed0(GridCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { - for (Cache<Integer, Object> cache : caches) { + for (GridCache<Integer, Object> cache : caches) { IgniteTx tx = cache.txStart(concurrency, REPEATABLE_READ); try { @@ -350,7 +350,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend tx.close(); } - for (Cache<Integer, Object> cacheInner : caches) { + for (GridCache<Integer, Object> cacheInner : caches) { tx = cacheInner.txStart(concurrency, REPEATABLE_READ); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index e7f724f..6b3f275 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -85,7 +85,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); - Cache<String, int[]> c = g.cache(null); + GridCache<String, int[]> c = g.cache(null); assertEquals("Cache is not empty: " + c.entrySet(), 0, c.size()); } @@ -131,7 +131,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra private Ignite ignite; @Override public Void applyx(final Integer i) throws IgniteCheckedException { - Cache<String, int[]> cache = this.ignite.cache(null); + GridCache<String, int[]> cache = this.ignite.cache(null); try (IgniteTx tx = cache.txStart(concur, isolation)) { int[] arr = cache.get("TestKey"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 9e87e57..22bd632 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -162,7 +162,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs startGrids(); try { - Cache<Integer, String> c = grid(idx).cache(CACHE_NAME); + GridCache<Integer, String> c = grid(idx).cache(CACHE_NAME); for (int j = 0; j < retries; j++) { for (int i = 0; i < keyCnt; i++) @@ -195,7 +195,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs * @param attempt Attempt. * @throws Exception If failed. */ - private void checkGet(Cache<Integer, String> c, int attempt) throws Exception { + private void checkGet(GridCache<Integer, String> c, int attempt) throws Exception { for (int i = 0; i < keyCnt; i++) { String v = c.get(i); @@ -495,7 +495,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs info("Starting put thread..."); - Cache<Integer, String> cache = grid(gridIdx).cache(CACHE_NAME); + GridCache<Integer, String> cache = grid(gridIdx).cache(CACHE_NAME); while (System.currentTimeMillis() < endTime && err.get() == null) { int key = RAND.nextInt(keyCnt); @@ -615,7 +615,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs UUID locNodeId = ignite.cluster().localNode().id(); - Cache<Integer, String> cache = ignite.cache(CACHE_NAME); + GridCache<Integer, String> cache = ignite.cache(CACHE_NAME); List<Integer> keys = new ArrayList<>(txKeys); @@ -765,7 +765,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs UUID locNodeId = ignite.cluster().localNode().id(); - Cache<Integer, String> cache = ignite.cache(CACHE_NAME); + GridCache<Integer, String> cache = ignite.cache(CACHE_NAME); List<Integer> keys = new ArrayList<>(txKeys); @@ -876,7 +876,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs * @param key Key. * @param attempt Attempt. */ - private void printFailureDetails(Cache<Integer, String> c, int key, int attempt) { + private void printFailureDetails(GridCache<Integer, String> c, int key, int attempt) { error("*** Failure details ***"); error("Key: " + key); error("Partition: " + c.configuration().getAffinity().partition(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index 770c723..6f2c416 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -89,7 +89,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs public void testPrimarySync() throws Exception { for (int i = 0; i < GRID_CNT; i++) { for (int j = 0; j < GRID_CNT; j++) { - Cache<Integer, Integer> cache = grid(j).cache(null); + GridCache<Integer, Integer> cache = grid(j).cache(null); if (cache.entry(i).primary()) { try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index 1205ae9..6f15f64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -113,7 +113,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { TestCommunicationSpi commSpi = (TestCommunicationSpi)grid(0).configuration().getCommunicationSpi(); - Cache<Object, Object> cache = ignite.cache(null); + GridCache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); @@ -145,7 +145,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testNearUpdateResponseLost() throws Exception { Ignite ignite = grid(0); - Cache<Object, Object> cache = ignite.cache(null); + GridCache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); @@ -179,7 +179,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testDhtUpdateRequestLost() throws Exception { Ignite ignite = grid(0); - Cache<Object, Object> cache = ignite.cache(null); + GridCache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); @@ -214,7 +214,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testDhtUpdateResponseLost() throws Exception { Ignite ignite = grid(0); - Cache<Object, Object> cache = ignite.cache(null); + GridCache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index 8a9397c..d904d99 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -100,9 +100,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes CacheEventListener lsnr = new CacheEventListener(latch); try { - Cache<String, String> cache1 = ignite1.cache(null); - Cache<String, String> cache2 = ignite2.cache(null); - Cache<String, String> cache3 = ignite3.cache(null); + GridCache<String, String> cache1 = ignite1.cache(null); + GridCache<String, String> cache2 = ignite2.cache(null); + GridCache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); @@ -175,9 +175,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes CacheEventListener lsnr = new CacheEventListener(latch); try { - Cache<String, String> cache1 = ignite1.cache(null); - Cache<String, String> cache2 = ignite2.cache(null); - Cache<String, String> cache3 = ignite3.cache(null); + GridCache<String, String> cache1 = ignite1.cache(null); + GridCache<String, String> cache2 = ignite2.cache(null); + GridCache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); @@ -253,9 +253,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes IgnitePredicate<IgniteEvent> lsnr = new CacheEventListener(latch); try { - Cache<String, String> cache1 = ignite1.cache(null); - Cache<String, String> cache2 = ignite2.cache(null); - Cache<String, String> cache3 = ignite3.cache(null); + GridCache<String, String> cache1 = ignite1.cache(null); + GridCache<String, String> cache2 = ignite2.cache(null); + GridCache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index 2503168..c94f90c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -96,7 +96,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst * @throws Exception If failed. */ public void testPutFromClientNode() throws Exception { - Cache<Object, Object> nearOnly = nearOnlyCache(); + GridCache<Object, Object> nearOnly = nearOnlyCache(); for (int i = 0; i < 5; i++) nearOnly.put(i, i); @@ -120,12 +120,12 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst * @throws Exception If failed. */ public void testGetFromClientNode() throws Exception { - Cache<Object, Object> dht = dhtCache(); + GridCache<Object, Object> dht = dhtCache(); for (int i = 0; i < 10; i++) dht.put(i, i); - Cache<Object, Object> nearOnly = nearOnlyCache(); + GridCache<Object, Object> nearOnly = nearOnlyCache(); assert dht != nearOnly; @@ -152,7 +152,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst if (F.eq(g.name(), nearOnlyGridName)) { for (int k = 0; k < 10000; k++) { - Cache<Object, Object> cache = g.cache(null); + GridCache<Object, Object> cache = g.cache(null); String key = "key" + k; @@ -167,7 +167,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst boolean foundAffinityNode = false; for (int k = 0; k < 10000; k++) { - Cache<Object, Object> cache = g.cache(null); + GridCache<Object, Object> cache = g.cache(null); String key = "key" + k; @@ -187,7 +187,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst /** * @return Near only cache for this test. */ - protected Cache<Object, Object> nearOnlyCache() { + protected GridCache<Object, Object> nearOnlyCache() { assert nearOnlyGridName != null; return G.ignite(nearOnlyGridName).cache(null); @@ -196,7 +196,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst /** * @return DHT cache for this test. */ - protected Cache<Object, Object> dhtCache() { + protected GridCache<Object, Object> dhtCache() { for (int i = 0; i < gridCount(); i++) { if (!nearOnlyGridName.equals(grid(i).name())) return grid(i).cache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java index 5e0c0be..a7c0991 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java @@ -71,7 +71,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac log.info("Use cache " + idx); - Cache<Object, Object> cache = grid(idx).cache(null); + GridCache<Object, Object> cache = grid(idx).cache(null); for (int i = 0; i < 100; i++) putAndCheckEntrySet(cache); @@ -89,7 +89,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac * @param cache Cache. * @throws Exception If failed. */ - private void putAndCheckEntrySet(Cache<Object, Object> cache) throws Exception { + private void putAndCheckEntrySet(GridCache<Object, Object> cache) throws Exception { try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer total = (Integer) cache.get(TX_KEY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java index aa3b705..bb96c69 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java @@ -59,7 +59,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr */ public void testIteration() throws Exception { try { - final Cache<String, Integer> cache = cache(); + final GridCache<String, Integer> cache = cache(); final int entryCnt = 1000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java index e620bcf..becab72 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -138,7 +138,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ private void clearCaches() throws IgniteCheckedException { for (int i = 0; i < gridCnt; i++) { - Cache<String, Integer> cache = cache(i); + GridCache<String, Integer> cache = cache(i); cache.removeAll(); @@ -199,7 +199,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe * @throws Exception If test failed. */ public void testFilteredPut() throws Exception { - Cache<String, Integer> cache = grid(0).cache(null); + GridCache<String, Integer> cache = grid(0).cache(null); String key = "1"; int val = 1; @@ -227,7 +227,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe runTest( new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { String key = "key"; Integer val = 1; @@ -253,7 +253,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -285,7 +285,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -325,7 +325,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe return; runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -351,7 +351,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveAsyncTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -383,7 +383,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveAsyncTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -419,7 +419,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutRemovex() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -443,7 +443,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutRemovexTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -473,7 +473,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutRemovexTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -507,7 +507,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutIfAbsent() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); Map.Entry<String, Integer> e = iter.next(); @@ -538,7 +538,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutIfAbsentTx() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); IgniteTx tx = cache.txStart(); @@ -576,7 +576,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutIfAbsentAsync() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); Map.Entry<String, Integer> e = iter.next(); @@ -610,7 +610,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe IgniteBiTuple[] evts = new IgniteBiTuple[] {F.t(EVT_CACHE_OBJECT_PUT, 2 * gridCnt), F.t(EVT_CACHE_OBJECT_READ, 1)}; runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); // Optimistic transaction. @@ -648,7 +648,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testFilteredPutRemovex() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -677,7 +677,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testFilteredPutRemovexTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { assert cache.keySet().isEmpty() : "Key set is not empty: " + cache().keySet(); Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); @@ -715,7 +715,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testFilteredPutRemovexTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -758,7 +758,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe * @param cache Cache. * @throws IgniteCheckedException If any exception occurs. */ - void run(Cache<String, Integer> cache) throws IgniteCheckedException; + void run(GridCache<String, Integer> cache) throws IgniteCheckedException; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java index ce53047..39a5aba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java @@ -75,7 +75,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testExpiredEntriesPreloading() throws Exception { - Cache<String, Integer> cache0 = cache(0); + GridCache<String, Integer> cache0 = cache(0); final int KEYS_NUM = 3; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java index 372c4db..246ff85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java @@ -64,7 +64,7 @@ public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testBasicOps() throws Exception { - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < 1000; i++) cache.put(i, i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index 0aec12f..6d3351b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -50,13 +50,13 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT private static Ignite ignite3; /** Cache 1. */ - private static Cache<Integer, String> cache1; + private static GridCache<Integer, String> cache1; /** Cache 2. */ - private static Cache<Integer, String> cache2; + private static GridCache<Integer, String> cache2; /** Cache 3. */ - private static Cache<Integer, String> cache3; + private static GridCache<Integer, String> cache3; /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -182,7 +182,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT for (Ignite ignite : ignites) addListener(ignite, lsnr); - Cache<Integer, String> cache1 = ignites[0].cache(null); + GridCache<Integer, String> cache1 = ignites[0].cache(null); for (int i = 1; i <= cnt; i++) cache1.put(i, "val" + i); @@ -197,7 +197,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT latch.await(10, SECONDS); for (Ignite ignite : ignites) { - Cache<Integer, String> cache = ignite.cache(null); + GridCache<Integer, String> cache = ignite.cache(null); if (cache == cache1) continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 2f995f9..e57434d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -277,7 +277,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra Ignite ignite = G.ignite(nodeName(0)); - Cache<Integer, Integer> cache = ignite.cache(CACHE_NAME); + GridCache<Integer, Integer> cache = ignite.cache(CACHE_NAME); int startKey = keysPerThread * idx; int endKey = keysPerThread * (idx + 1); @@ -500,11 +500,11 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra */ @SuppressWarnings({"TooBroadScope", "ConstantIfStatement"}) private boolean compareCaches(Map<Integer, Integer> expVals) throws Exception { - List<Cache<Integer, Integer>> caches = new ArrayList<>(dataNodes()); + List<GridCache<Integer, Integer>> caches = new ArrayList<>(dataNodes()); List<GridDhtCacheAdapter<Integer, Integer>> dhtCaches = null; for (int i = 0 ; i < dataNodes(); i++) { - Cache<Integer, Integer> cache = G.ignite(nodeName(i)).cache(CACHE_NAME); + GridCache<Integer, Integer> cache = G.ignite(nodeName(i)).cache(CACHE_NAME); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index d0a4175..49611c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -122,7 +122,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac * @param i Grid index. * @return Cache. */ - @Override protected <K, V> Cache<K, V> cache(int i) { + @Override protected <K, V> GridCache<K, V> cache(int i) { return IGNITEs.get(i).cache(null); } @@ -163,7 +163,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac Ignite g = grid(idx); - Cache<Integer, String> cache = cache(idx); + GridCache<Integer, String> cache = cache(idx); IgniteTx tx = cache.txStart(concurrency, isolation); @@ -188,7 +188,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac U.sleep(getInteger(GG_TX_SALVAGE_TIMEOUT, 3000)); - Cache<Integer, String> checkCache = cache(checkIdx); + GridCache<Integer, String> checkCache = cache(checkIdx); boolean locked = false; @@ -237,7 +237,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac info("Nodes for key [id=" + grid(idx).cache(null).affinity().mapKeyToPrimaryAndBackups(KEY) + ", key=" + KEY + ']'); - Cache<Integer, String> cache = cache(idx); + GridCache<Integer, String> cache = cache(idx); // TODO: GG-7437. if (cache.configuration().getCacheMode() == CacheMode.REPLICATED) @@ -251,7 +251,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac info("Check grid index: " + checkIdx); - Cache<Integer, String> checkCache = cache(checkIdx); + GridCache<Integer, String> checkCache = cache(checkIdx); assert !checkCache.lock(KEY, -1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java index 9392386..d93b648 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java @@ -126,7 +126,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra CacheAffinityFunction aff = cacheConfiguration(grid(0).configuration(), null).getAffinity(); - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < partCnt; i++) { assertEquals(i, aff.partition(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index 31eef8d..bccdcb9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.Cache; +import org.apache.ignite.cache.GridCache; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -56,7 +56,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid private final Map<Integer, String> map = new ConcurrentHashMap8<>(); /** Collection of caches, one per grid node. */ - private List<Cache<Integer, String>> caches; + private List<GridCache<Integer, String>> caches; /** {@inheritDoc} */ @SuppressWarnings("unchecked") @@ -186,7 +186,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid */ public void testReloadAll() throws Exception { // Fill caches with values. - for (Cache<Integer, String> cache : caches) { + for (GridCache<Integer, String> cache : caches) { Iterable<Integer> keys = primaryKeysForCache(cache, 100); info("Values [cache=" + caches.indexOf(cache) + ", size=" + F.size(keys.iterator()) + ", keys=" + keys + "]"); @@ -195,14 +195,14 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid map.put(key, "val" + key); } - Collection<Cache<Integer, String>> emptyCaches = new ArrayList<>(caches); + Collection<GridCache<Integer, String>> emptyCaches = new ArrayList<>(caches); - for (Cache<Integer, String> cache : caches) { + for (GridCache<Integer, String> cache : caches) { info("Reloading cache: " + caches.indexOf(cache)); // Check data is reloaded only on the nodes on which reloadAll() has been called. if (!nearEnabled()) { - for (Cache<Integer, String> eCache : emptyCaches) + for (GridCache<Integer, String> eCache : emptyCaches) assertEquals("Non-null values found in cache [cache=" + caches.indexOf(eCache) + ", size=" + eCache.size() + ", size=" + eCache.size() + ", entrySetSize=" + eCache.entrySet().size() + "]", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java index 0d1bed6..b9c49c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java @@ -96,7 +96,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA public void testPreloadEvents() throws Exception { Ignite g1 = startGrid("g1"); - Cache<Integer, String> cache = g1.cache(null); + GridCache<Integer, String> cache = g1.cache(null); cache.put(1, "val1"); cache.put(2, "val2"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index c19e8ac..080ec6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -210,14 +210,14 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon * @return Affinity. */ @SuppressWarnings({"unchecked"}) - private CacheAffinityFunction affinity(Cache<Integer, ?> cache) { + private CacheAffinityFunction affinity(GridCache<Integer, ?> cache) { return cache.configuration().getAffinity(); } /** * @param c Cache projection. */ - private void affinityBeforeStop(Cache<Integer, String> c) { + private void affinityBeforeStop(GridCache<Integer, String> c) { for (int key = 0; key < keyCnt; key++) { int part = affinity(c).partition(key); @@ -229,7 +229,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon /** * @param c Cache projection. */ - private void affinityAfterStart(Cache<Integer, String> c) { + private void affinityAfterStart(GridCache<Integer, String> c) { if (DEBUG) { for (int key = 0; key < keyCnt; key++) { int part = affinity(c).partition(key); @@ -249,7 +249,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon startGrids(); try { - Cache<Integer, String> c = grid(idx).cache(CACHE_NAME); + GridCache<Integer, String> c = grid(idx).cache(CACHE_NAME); for (int j = 0; j < retries; j++) { for (int i = 0; i < keyCnt; i++) @@ -286,7 +286,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon * @param attempt Attempt. * @throws Exception If failed. */ - private void checkGet(Cache<Integer, String> c, int attempt) throws Exception { + private void checkGet(GridCache<Integer, String> c, int attempt) throws Exception { for (int i = 0; i < keyCnt; i++) { String v = c.get(i); @@ -312,7 +312,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon * @param key Key. * @param attempt Attempt. */ - private void printFailureDetails(Cache<Integer, String> c, int key, int attempt) { + private void printFailureDetails(GridCache<Integer, String> c, int key, int attempt) { error("*** Failure details ***"); error("Key: " + key); error("Partition: " + c.configuration().getAffinity().partition(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index 08de5ac..faf4591 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -145,7 +145,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom try { GridKernal grid = (GridKernal)grid(idx); - Cache<Integer, Integer> cache = grid.cache(null); + GridCache<Integer, Integer> cache = grid.cache(null); List<Integer> keys = new ArrayList<>(); @@ -183,7 +183,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom for (int i = 0; i < GRID_CNT; i++) { GridEx grid = grid(i); - Cache<Integer, Integer> cache = grid.cache(null); + GridCache<Integer, Integer> cache = grid.cache(null); if (cache.affinity().isPrimaryOrBackup(grid.localNode(), k)) { if (val == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 0fe8eb2..476b465 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -152,7 +152,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri GridTestUtils.runAsync(new Callable<Object>() { @Override public Object call() throws Exception { - Cache<Integer, String> cache = txIgniteNode.cache(null); + GridCache<Integer, String> cache = txIgniteNode.cache(null); assertNotNull(cache); @@ -212,7 +212,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri private Ignite ignite; @Override public Void call() throws Exception { - Cache<Integer, String> cache = ignite.cache(null); + GridCache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index 17dd8ca..4d8fee4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -175,7 +175,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - Cache<Integer, String> cache = originatingNodeGrid.cache(null); + GridCache<Integer, String> cache = originatingNodeGrid.cache(null); assertNotNull(cache); @@ -251,7 +251,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest private Ignite ignite; @Override public Void call() throws Exception { - Cache<Integer, String> cache = ignite.cache(null); + GridCache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); @@ -305,7 +305,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest Map<Integer, Collection<ClusterNode>> nodeMap = new HashMap<>(); - Cache<Integer, String> cache = grid(0).cache(null); + GridCache<Integer, String> cache = grid(0).cache(null); info("Failing node ID: " + grid(1).localNode().id()); @@ -382,7 +382,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest private Ignite ignite; @Override public Void call() throws Exception { - Cache<Integer, String> cache = ignite.cache(null); + GridCache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index bac9625..80ba5f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -64,7 +64,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { * @param i Grid index. * @return Cache. */ - @Override protected <K, V> Cache<K, V> cache(int i) { + @Override protected <K, V> GridCache<K, V> cache(int i) { return IGNITEs.get(i).cache(null); } @@ -120,7 +120,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { int idx = RAND.nextInt(GRID_COUNT); - Cache<Integer, String> cache = cache(idx); + GridCache<Integer, String> cache = cache(idx); IgniteTx tx = cache.txStart(concurrency, isolation, TIMEOUT, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java index 7cf7a3d..8dbf81e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java @@ -42,13 +42,13 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex protected static final String CACHE_ATOMIC_OFFHEAP_TIERED = "cache_atomic_offheap_tiered"; /** Atomic caches. */ - private static Cache<Integer, Object>[] cachesAtomic; + private static GridCache<Integer, Object>[] cachesAtomic; /** Atomic offheap caches. */ - private static Cache<Integer, Object>[] cachesAtomicOffheap; + private static GridCache<Integer, Object>[] cachesAtomicOffheap; /** Atomic offheap caches. */ - private static Cache<Integer, Object>[] cachesAtomicOffheapTiered; + private static GridCache<Integer, Object>[] cachesAtomicOffheapTiered; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -98,9 +98,9 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex int gridCnt = gridCount(); - cachesAtomic = new Cache[gridCnt]; - cachesAtomicOffheap = new Cache[gridCnt]; - cachesAtomicOffheapTiered = new Cache[gridCnt]; + cachesAtomic = new GridCache[gridCnt]; + cachesAtomicOffheap = new GridCache[gridCnt]; + cachesAtomicOffheapTiered = new GridCache[gridCnt]; for (int i = 0; i < gridCount(); i++) { cachesAtomic[i] = ignites[i].cache(CACHE_ATOMIC); @@ -151,13 +151,13 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex * @param caches Caches. * @throws Exception If failed. */ - private void testAtomic0(Cache<Integer, Object>[] caches) throws Exception { + private void testAtomic0(GridCache<Integer, Object>[] caches) throws Exception { byte[] val = wrap(1); - for (Cache<Integer, Object> cache : caches) { + for (GridCache<Integer, Object> cache : caches) { cache.put(KEY_1, val); - for (Cache<Integer, Object> cacheInner : caches) + for (GridCache<Integer, Object> cacheInner : caches) assertArrayEquals(val, (byte[])cacheInner.get(KEY_1)); cache.remove(KEY_1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index 1049442..4f297b8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@ -161,7 +161,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - Cache<Integer, Integer> cache0 = ignite0.cache(null); + GridCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = cache0.affinity(); @@ -224,7 +224,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - Cache<Integer, Integer> cache = grid(i).cache(null); + GridCache<Integer, Integer> cache = grid(i).cache(null); for (Integer key : nearKeys.keySet()) nearKeys.put(key, val); @@ -439,7 +439,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private void checkPutRemoveGet() throws Exception { Ignite ignite0 = grid(0); - Cache<Integer, Integer> cache0 = ignite0.cache(null); + GridCache<Integer, Integer> cache0 = ignite0.cache(null); Integer key = key(ignite0, NOT_PRIMARY_AND_BACKUP); @@ -477,7 +477,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(grid); - Cache<Integer, Integer> cache0 = ignite0.cache(null); + GridCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = cache0.affinity(); @@ -524,7 +524,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - Cache<Integer, Integer> cache = grid(i).cache(null); + GridCache<Integer, Integer> cache = grid(i).cache(null); log.info("Put [grid=" + grid(i).name() + ", val=" + val + ']'); @@ -554,7 +554,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - Cache<Integer, Integer> cache0 = ignite0.cache(null); + GridCache<Integer, Integer> cache0 = ignite0.cache(null); Integer primaryKey = key(ignite0, PRIMARY); @@ -600,7 +600,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - Cache<Integer, Integer> cache0 = ignite0.cache(null); + GridCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = cache0.affinity(); @@ -624,7 +624,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { checkEntry(grid(i), nearKey, 1, false, expReaders); } - Cache<Integer, Integer> primaryCache = G.ignite( + GridCache<Integer, Integer> primaryCache = G.ignite( (String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null); delay(); @@ -650,7 +650,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private void checkReaderRemove() throws Exception { Ignite ignite0 = grid(0); - Cache<Integer, Integer> cache0 = ignite0.cache(null); + GridCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = cache0.affinity(); @@ -675,7 +675,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { delay(); - Cache<Integer, Integer> primaryCache = primaryNode.cache(null); + GridCache<Integer, Integer> primaryCache = primaryNode.cache(null); primaryCache.put(nearKey, 2); // Put from primary, check there are no readers. @@ -735,7 +735,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { * @return Key with properties specified by the given mode. */ private Integer key(Ignite ignite, int mode) { - Cache<Integer, Integer> cache = ignite.cache(null); + GridCache<Integer, Integer> cache = ignite.cache(null); CacheAffinity<Integer> aff = cache.affinity(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index ce8bb06..4e4b850 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -58,7 +58,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA private static Ignite[] ignites; /** Regular caches. */ - private static Cache<Integer, String>[] caches; + private static GridCache<Integer, String>[] caches; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -93,7 +93,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA @SuppressWarnings("unchecked") @Override protected void beforeTest() throws Exception { ignites = new Ignite[GRID_CNT]; - caches = new Cache[GRID_CNT]; + caches = new GridCache[GRID_CNT]; for (int i = 0; i < GRID_CNT; i++) { ignites[i] = startGrid(i); @@ -116,7 +116,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA * @throws Exception If failed. */ public void testOptimisticTransaction() throws Exception { - for (Cache<Integer, String> cache : caches) { + for (GridCache<Integer, String> cache : caches) { IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ); try { @@ -128,7 +128,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA tx.close(); } - for (Cache<Integer, String> cacheInner : caches) { + for (GridCache<Integer, String> cacheInner : caches) { tx = cacheInner.txStart(OPTIMISTIC, REPEATABLE_READ); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java index 3b78325..d5c76ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java @@ -100,7 +100,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ private void checkNodes(Ignite g) throws Exception { - Cache<String, String> cache = g.cache("test"); + GridCache<String, String> cache = g.cache("test"); for (char c = 'a'; c <= 'z'; c++) { String key = Character.toString(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java index 380d51f..21d4da6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java @@ -78,7 +78,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest { startGridsMultiThreaded(nodeCnt); - Cache<Integer, Integer> cache = grid(nodeCnt - 1).cache(null); + GridCache<Integer, Integer> cache = grid(nodeCnt - 1).cache(null); int kv = 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java index 89af5cd..a9e825a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java @@ -55,14 +55,14 @@ public class GridCacheDhtMultiBackupTest extends GridCommonAbstractTest { @Override public void applyx() throws IgniteCheckedException { X.println("Checking whether cache is empty."); - Cache<SampleKey, SampleValue> cache = g.cache("partitioned"); + GridCache<SampleKey, SampleValue> cache = g.cache("partitioned"); assert cache.isEmpty(); } } ); - Cache<SampleKey, SampleValue> cache = g.cache("partitioned"); + GridCache<SampleKey, SampleValue> cache = g.cache("partitioned"); int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java index 21dcc85..9295a05 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java @@ -138,7 +138,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { Thread.sleep(10000); for (int i = 0; i < gridCnt; i++) { - Cache<Integer, String> c = grid(i).cache(null); + GridCache<Integer, String> c = grid(i).cache(null); if (backups + 1 <= gridCnt) assert c.size() < cnt : "Cache size: " + c.size(); @@ -167,7 +167,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { if (evt == LifecycleEventType.AFTER_GRID_START) { - Cache<Integer, byte[]> c = ignite.cache(null); + GridCache<Integer, byte[]> c = ignite.cache(null); if (c.putxIfAbsent(-1, new byte[1])) { populate(c, cnt, KBSIZE); @@ -189,7 +189,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { Thread.sleep(10000); for (int i = 0; i < gridCnt; i++) { - Cache<Integer, String> c = grid(i).cache(null); + GridCache<Integer, String> c = grid(i).cache(null); if (backups + 1 <= gridCnt) assert c.size() < cnt; @@ -208,7 +208,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { * @param kbSize Size in KB. * @throws IgniteCheckedException If failed. */ - private void populate(Cache<Integer, byte[]> c, int cnt, int kbSize) throws IgniteCheckedException { + private void populate(GridCache<Integer, byte[]> c, int cnt, int kbSize) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, value(kbSize)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 388b757..32bfad3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -107,7 +107,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - Cache<String, Integer> c0 = g0.cache(null); + GridCache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -115,8 +115,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - Cache<String, Integer> c1 = g1.cache(null); - Cache<String, Integer> c2 = g2.cache(null); + GridCache<String, Integer> c1 = g1.cache(null); + GridCache<String, Integer> c2 = g2.cache(null); for (int i = 0; i < cnt; i++) assertNull(c1.peek(Integer.toString(i))); @@ -184,7 +184,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - Cache<String, Integer> c0 = g0.cache(null); + GridCache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -192,8 +192,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - Cache<String, Integer> c1 = g1.cache(null); - Cache<String, Integer> c2 = g2.cache(null); + GridCache<String, Integer> c1 = g1.cache(null); + GridCache<String, Integer> c2 = g2.cache(null); for (int i = 0; i < cnt; i++) assertNull(c1.peek(Integer.toString(i))); @@ -254,7 +254,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - Cache<String, Integer> c0 = g0.cache(null); + GridCache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -262,8 +262,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - Cache<String, Integer> c1 = g1.cache(null); - Cache<String, Integer> c2 = g2.cache(null); + GridCache<String, Integer> c1 = g1.cache(null); + GridCache<String, Integer> c2 = g2.cache(null); GridDhtCacheAdapter<String, Integer> d0 = dht(0); GridDhtCacheAdapter<String, Integer> d1 = dht(1); @@ -395,7 +395,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { * @param c Cache. * @param keyCnt Key count. */ - private void checkCache(Cache<String, Integer> c, int keyCnt) { + private void checkCache(GridCache<String, Integer> c, int keyCnt) { Ignite g = c.gridProjection().ignite(); for (int i = 0; i < keyCnt; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java index 14221ab..65d85ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java @@ -172,7 +172,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest try { Ignite ignite1 = startGrid(0); - Cache<Integer, String> cache1 = ignite1.cache(null); + GridCache<Integer, String> cache1 = ignite1.cache(null); int keyCnt = 10; @@ -193,7 +193,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite g : ignites) { - Cache<Integer, String> c = g.cache(null); + GridCache<Integer, String> c = g.cache(null); for (int i = 0; i < keyCnt; i++) assertNull(c.peek(i)); @@ -217,7 +217,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite gg : ignites) { - Cache<Integer, String> c = gg.cache(null); + GridCache<Integer, String> c = gg.cache(null); for (int i = 0; i < keyCnt; i++) assertNull(c.peek(i)); @@ -271,7 +271,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest * @param cnt Key count. * @throws IgniteCheckedException If failed. */ - private void putKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException { + private void putKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, Integer.toString(i)); }
