http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index e69d160..5d89685 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -74,8 +74,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < size; i++) putMap.put(i, i * i); - Cache<Object, Object> prj0 = grid(0).cache(null); - Cache<Object, Object> prj1 = grid(1).cache(null); + GridCache<Object, Object> prj0 = grid(0).cache(null); + GridCache<Object, Object> prj1 = grid(1).cache(null); prj0.putAll(putMap); @@ -101,8 +101,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < size; i++) putMap.put(i, i); - Cache<Object, Object> prj0 = grid(0).cache(null); - Cache<Object, Object> prj1 = grid(1).cache(null); + GridCache<Object, Object> prj0 = grid(0).cache(null); + GridCache<Object, Object> prj1 = grid(1).cache(null); prj0.putAll(putMap); @@ -135,7 +135,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti int size = 10; - Cache<Object, Object> prj0 = grid(0).cache(null); + GridCache<Object, Object> prj0 = grid(0).cache(null); for (int i = 0; i < size; i++) { info("Putting value [i=" + i + ']'); @@ -148,7 +148,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < gridCount(); i++) { assertEquals(0, context(i).tm().idMapSize()); - Cache<Object, Object> cache = grid(i).cache(null); + GridCache<Object, Object> cache = grid(i).cache(null); ClusterNode node = grid(i).localNode(); for (int k = 0; k < size; k++) { @@ -230,7 +230,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti Integer nearPeekVal = nearEnabled ? 1 : null; - Cache<String, Integer> c = cache(i); + GridCache<String, Integer> c = cache(i); CacheEntry<String, Integer> e = c.entry("key"); @@ -267,7 +267,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti Integer nearPeekVal = nearEnabled ? 1 : null; - Cache<String, Integer> c = cache(i); + GridCache<String, Integer> c = cache(i); CacheEntry<String, Integer> e = c.entry("key"); @@ -366,7 +366,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("Node: " + node); - Cache<String, Integer> cache = G.ignite(node.id()).cache(null); + GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); checkLockAsyncWithTimeoutEntry("key", cache); } @@ -384,7 +384,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("Node: " + node); - Cache<String, Integer> cache = G.ignite(node.id()).cache(null); + GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); checkLockAsyncWithTimeoutEntry("key", cache); } @@ -412,7 +412,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("Node: " + node); - Cache<String, Integer> cache = G.ignite(node.id()).cache(null); + GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); checkLockAsyncWithTimeoutEntry("key", cache); } @@ -542,7 +542,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("All affinity nodes: " + affinityNodes()); - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); info("Cache affinity nodes: " + cache.affinity().mapKeyToPrimaryAndBackups(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/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index 9e1499e..36515f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -175,7 +175,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA multithreaded(new CAX() { @SuppressWarnings({"BusyWait"}) @Override public void applyx() throws IgniteCheckedException { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { int kv = cntr.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index bb3289e..7f68b6d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -84,8 +84,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { switch (evt) { case AFTER_GRID_START: { - Cache<Object, MyValue> c1 = ignite.cache("one"); - Cache<Object, MyValue> c2 = ignite.cache("two"); + GridCache<Object, MyValue> c1 = ignite.cache("one"); + GridCache<Object, MyValue> c2 = ignite.cache("two"); if (!ignite.name().contains("Test0")) { info("Keys already in cache:"); @@ -145,8 +145,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - Cache<Object, MyValue> c1 = grid(j).cache("one"); - Cache<Object, MyValue> c2 = grid(j).cache("two"); + GridCache<Object, MyValue> c1 = grid(j).cache("one"); + GridCache<Object, MyValue> c2 = grid(j).cache("two"); int k = 0; @@ -175,7 +175,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - Cache<Object, MyValue> c2 = grid(j).cache("two"); + GridCache<Object, MyValue> c2 = grid(j).cache("two"); CacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(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/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java index 14beacb..1ff2317 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java @@ -128,7 +128,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb final Person p3 = new Person("Mike", 1800, "Bachelor"); final Person p4 = new Person("Bob", 1900, "Bachelor"); - final Cache<UUID, Person> cache0 = grid(0).cache(null); + final GridCache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java index e8f6dad..c6cb6be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; 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.internal.processors.cache.distributed.*; @@ -47,13 +47,13 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest private static final AtomicInteger CNT = new AtomicInteger(0); /** */ - private Cache<Integer, Integer> cache1; + private GridCache<Integer, Integer> cache1; /** */ - private Cache<Integer, Integer> cache2; + private GridCache<Integer, Integer> cache2; /** */ - private Cache<Integer, Integer> cache3; + private GridCache<Integer, Integer> cache3; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index c891ab3..db674fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -198,7 +198,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes IgniteFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { - Cache<Object, Object> c = cache(0); + GridCache<Object, Object> c = cache(0); try { IgniteTx tx = c.txStart(mode, 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/near/GridCachePutArrayValueSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java index 84ec8ab..c1f2d10 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java @@ -50,7 +50,7 @@ public class GridCachePutArrayValueSelfTest extends GridCacheAbstractSelfTest { public void testInternalKeys() throws Exception { assert gridCount() >= 2; - Cache<InternalKey, Object> prj = grid(0).cache(null); + GridCache<InternalKey, Object> prj = grid(0).cache(null); final InternalKey key = new InternalKey(0); // Hangs on the first remote put. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java index 281a6d4..ffe7c00 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java @@ -71,7 +71,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac Map<Integer, Collection<UUID>> mapping = new HashMap<>(); for (int i = 0; i < 4; i++) { - Cache<Object, Object> cache = grid(i).cache(null); + GridCache<Object, Object> cache = grid(i).cache(null); CacheAffinity<Object> 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/near/GridPartitionedBackupLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java index 9f3a512..b7391cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; 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.spi.discovery.*; @@ -109,7 +109,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest { assert store.get(1) == 1; for (int i = 0; i < GRID_CNT; i++) { - Cache<Integer, Integer> cache = cache(i); + GridCache<Integer, Integer> cache = cache(i); CacheEntry<Integer, Integer> entry = cache.entry(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/near/IgniteTxReentryNearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java index 657fe22..8c42fbe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java @@ -43,7 +43,7 @@ public class IgniteTxReentryNearSelfTest extends IgniteTxReentryAbstractSelfTest @Override protected int testKey() { int key = 0; - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); while (true) { Collection<ClusterNode> nodes = cache.affinity().mapKeyToPrimaryAndBackups(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/replicated/GridCacheReplicatedInvalidateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java index 9debdbe..824fe71 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java @@ -152,7 +152,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes IgniteTxIsolation isolation) throws Throwable { int idx = RAND.nextInt(GRID_CNT); - Cache<Integer, String> cache = cache(idx); + GridCache<Integer, String> cache = cache(idx); IgniteTx tx = cache.txStart(concurrency, isolation, 0, 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/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index 1b75428..73a99cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -78,8 +78,8 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac assert g1.cluster().nodes().size() > 1 : "This test needs at least two grid nodes started."; - Cache<Object, Object> cache1 = g1.cache(null); - Cache<Object, Object> cache2 = g2.cache(null); + GridCache<Object, Object> cache1 = g1.cache(null); + GridCache<Object, Object> cache2 = g2.cache(null); try { ClassLoader ldr = new GridTestClassLoader( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index d440094..266ba56 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -85,8 +85,8 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { switch (evt) { case AFTER_GRID_START: { - Cache<Object, MyValue> c1 = ignite.cache("one"); - Cache<Object, MyValue> c2 = ignite.cache("two"); + GridCache<Object, MyValue> c1 = ignite.cache("one"); + GridCache<Object, MyValue> c2 = ignite.cache("two"); if (!ignite.name().contains("Test0")) { if (!quiet) { @@ -148,8 +148,8 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - Cache<String, MyValue> c1 = grid(j).cache("one"); - Cache<String, MyValue> c2 = grid(j).cache("two"); + GridCache<String, MyValue> c1 = grid(j).cache("one"); + GridCache<String, MyValue> c2 = grid(j).cache("two"); int size1 = c1.size(); int size2 = c2.size(); @@ -178,7 +178,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - Cache<Object, MyValue> c2 = grid(j).cache("two"); + GridCache<Object, MyValue> c2 = grid(j).cache("two"); CacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(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/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index e98f352..9e497bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -153,7 +153,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { try { Ignite g1 = startGrid(1); - Cache<Integer, String> cache1 = g1.cache(null); + GridCache<Integer, String> cache1 = g1.cache(null); cache1.put(1, "val1"); cache1.put(2, "val2"); @@ -186,7 +186,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { assertEquals(EVT_CACHE_PRELOAD_STARTED, iter.next().type()); assertEquals(EVT_CACHE_PRELOAD_STOPPED, iter.next().type()); - Cache<Integer, String> cache2 = g2.cache(null); + GridCache<Integer, String> cache2 = g2.cache(null); assertEquals("val1", cache2.peek(1)); assertEquals("val2", cache2.peek(2)); @@ -214,8 +214,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - Cache<Integer, Object> cache1 = g1.cache(null); - Cache<Integer, Object> cache2 = g2.cache(null); + GridCache<Integer, Object> cache1 = g1.cache(null); + GridCache<Integer, Object> cache2 = g2.cache(null); ClassLoader ldr = new GridTestClassLoader( GridCacheReplicatedPreloadSelfTest.class.getName(), @@ -241,7 +241,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { Ignite g3 = startGrid(3); - Cache<Integer, Object> cache3 = g3.cache(null); + GridCache<Integer, Object> cache3 = g3.cache(null); Object v3 = cache3.peek(1); @@ -267,14 +267,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 512; try { - Cache<Integer, String> cache1 = startGrid(1).cache(null); + GridCache<Integer, String> cache1 = startGrid(1).cache(null); int keyCnt = 1000; for (int i = 0; i < keyCnt; i++) cache1.put(i, "val" + i); - Cache<Integer, String> cache2 = startGrid(2).cache(null); + GridCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(keyCnt, cache2.size()); } @@ -291,14 +291,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 256; try { - Cache<Integer, String> cache1 = startGrid(1).cache(null); + GridCache<Integer, String> cache1 = startGrid(1).cache(null); int keyCnt = 2000; for (int i = 0; i < keyCnt; i++) cache1.put(i, "val" + i); - Cache<Integer, String> cache2 = startGrid(2).cache(null); + GridCache<Integer, String> cache2 = startGrid(2).cache(null); int size = cache2.size(); @@ -345,14 +345,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 1; // 1 byte but one entry should be in batch anyway. try { - Cache<Integer, String> cache1 = startGrid(1).cache(null); + GridCache<Integer, String> cache1 = startGrid(1).cache(null); int cnt = 100; for (int i = 0; i < cnt; i++) cache1.put(i, "val" + i); - Cache<Integer, String> cache2 = startGrid(2).cache(null); + GridCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(cnt, cache2.size()); } @@ -369,14 +369,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 1000; // 1000 bytes. try { - Cache<Integer, String> cache1 = startGrid(1).cache(null); + GridCache<Integer, String> cache1 = startGrid(1).cache(null); int cnt = 100; for (int i = 0; i < cnt; i++) cache1.put(i, "val" + i); - Cache<Integer, String> cache2 = startGrid(2).cache(null); + GridCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(cnt, cache2.size()); } @@ -393,14 +393,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 10000; // 10000 bytes. try { - Cache<Integer, String> cache1 = startGrid(1).cache(null); + GridCache<Integer, String> cache1 = startGrid(1).cache(null); int cnt = 100; for (int i = 0; i < cnt; i++) cache1.put(i, "val" + i); - Cache<Integer, String> cache2 = startGrid(2).cache(null); + GridCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(cnt, cache2.size()); } @@ -451,7 +451,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { info("Cache size is OK for grid index: " + gridIdx); } - Cache<Integer, String> lastCache = startGrid(gridCnt).cache(null); + GridCache<Integer, String> lastCache = startGrid(gridCnt).cache(null); // Let preloading start. Thread.sleep(1000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java index 9afbf84..f2d07ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.eviction; 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.eviction.fifo.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.internal.processors.cache.*; @@ -118,7 +118,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest final AtomicInteger evictedKeysCnt = new AtomicInteger(); - final Cache<Object, Object> cache = g.cache(null); + final GridCache<Object, Object> cache = g.cache(null); cache.loadCache(null, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index 07335b3..a5a4fba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -172,7 +172,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb try { Ignite ignite = startGrid(1); - final Cache<Integer, Integer> cache = ignite.cache(null); + final GridCache<Integer, Integer> cache = ignite.cache(null); long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index 429c229..5726c11 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -132,7 +132,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest try { Ignite ignite = startGrid(1); - final Cache<Integer, Integer> cache = ignite.cache(null); + final GridCache<Integer, Integer> cache = ignite.cache(null); // Warm up. for (int i = 0; i < warmUpPutsCnt; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 925e829..38b4011 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -167,7 +167,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes Ignite g = startGrid(0); - final Cache<Integer, Integer> cache = g.cache(null); + final GridCache<Integer, Integer> cache = g.cache(null); for (int i = 1; i < 20; i++) { cache.putx(i * gridCnt, i * gridCnt); @@ -183,7 +183,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes Ignite ignite = grid(0); - final Cache<Integer, Integer> cache = ignite.cache(null); + final GridCache<Integer, Integer> cache = ignite.cache(null); // Put 1 entry to primary node. cache.putx(0, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index 66e7cce..318dbc4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.eviction; 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.transactions.*; @@ -171,7 +171,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb Ignite g = startGrids(); - Cache<String, String> cache = g.cache(null); + GridCache<String, String> cache = g.cache(null); try { info(">>> Checking policy [txConcurrency=" + txConcurrency + ", txIsolation=" + txIsolation + @@ -194,7 +194,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb * @param cache Cache to test. * @throws Exception If failed. */ - private void checkImplicitTx(Cache<String, String> cache) throws Exception { + private void checkImplicitTx(GridCache<String, String> cache) throws Exception { assertNull(cache.get("key1")); assertNull(cache.getAsync("key2").get()); @@ -214,7 +214,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb * @param cache Cache to test. * @throws Exception If failed. */ - private void checkExplicitTx(Cache<String, String> cache) throws Exception { + private void checkExplicitTx(GridCache<String, String> cache) throws Exception { IgniteTx tx = cache.txStart(); try { @@ -284,7 +284,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb * @throws org.apache.ignite.IgniteInterruptedException If interrupted while sleeping. */ @SuppressWarnings({"ErrorNotRethrown", "TypeMayBeWeakened"}) - private void checkEmpty(Cache<String, String> cache) throws IgniteInterruptedException { + private void checkEmpty(GridCache<String, String> cache) throws IgniteInterruptedException { for (int i = 0; i < 3; i++) { try { assertTrue(cache.entrySet().toString(), cache.entrySet().isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index 2baf7a6..4b46c0a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -295,7 +295,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic int cnt = 500; for (int i = 0; i < cnt; i++) { - Cache<Integer, String> cache = grid(rand.nextInt(2)).cache(null); + GridCache<Integer, String> cache = grid(rand.nextInt(2)).cache(null); int key = rand.nextInt(100); String val = Integer.toString(key); @@ -346,7 +346,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic int cnt = 100; for (int i = 0; i < cnt && !Thread.currentThread().isInterrupted(); i++) { - Cache<Integer, String> cache = grid(rand.nextInt(2)).cache(null); + GridCache<Integer, String> cache = grid(rand.nextInt(2)).cache(null); int key = rand.nextInt(1000); String val = Integer.toString(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java index 9a339b3..6f73fbf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java @@ -131,7 +131,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { try { Ignite g = grid(0); - Cache<Object, Object> c = g.cache(null); + GridCache<Object, Object> c = g.cache(null); int cnt = 1; @@ -186,7 +186,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); - Cache<Object, Object> cache = g.cache(null); + GridCache<Object, Object> cache = g.cache(null); try { int id = 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index ac8f141..8d667ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -117,7 +117,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final Cache<Integer, Integer> cache = ignite.cache(null); + final GridCache<Integer, Integer> cache = ignite.cache(null); final Random rnd = new Random(); @@ -169,7 +169,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final Cache<Integer, Integer> cache = ignite.cache(null); + final GridCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 100; i++) cache.put(i, i); @@ -196,7 +196,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final Cache<Integer, Integer> cache = ignite.cache(null); + final GridCache<Integer, Integer> cache = ignite.cache(null); Collection<Integer> keys = new ArrayList<>(100); @@ -229,7 +229,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { Integer affKey = 1; - Cache<CacheAffinityKey<Object>, Integer> cache = g.cache(null); + GridCache<CacheAffinityKey<Object>, Integer> cache = g.cache(null); IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 5); @@ -275,7 +275,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { Integer affKey = 1; - Cache<Object, Integer> cache = g.cache(null); + GridCache<Object, Integer> cache = g.cache(null); IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affKey), PESSIMISTIC, REPEATABLE_READ, 0, 5); @@ -320,7 +320,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final Cache<Integer, Integer> cache = ignite.cache(null); + final GridCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 10000; i++) cache.reload(i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java index 2e1b97f..b4f53dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java @@ -77,7 +77,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst * @throws Exception If failed. */ public void testSynchronousEvictions() throws Exception { - Cache<String, Integer> cache = cache(0); + GridCache<String, Integer> cache = cache(0); final AtomicBoolean stop = new AtomicBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java index b6d9560..dfd3bd6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java @@ -300,7 +300,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends Ignite ignite = startGrid(); try { - Cache<Integer, Integer> cache = ignite.cache(null); + GridCache<Integer, Integer> cache = ignite.cache(null); int cnt = 500; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java index dbbed6c..60c7504 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java @@ -347,7 +347,7 @@ public class GridCacheLruEvictionPolicySelfTest extends Ignite ignite = startGrid(); try { - Cache<Integer, Integer> cache = ignite.cache(null); + GridCache<Integer, Integer> cache = ignite.cache(null); int cnt = 500; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java index 3fae32e..6a2e05a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java @@ -120,7 +120,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe info("Getting " + cnt + " keys from cache."); for (int i = 0; i < cnt; i++) { - Cache<Integer, String> cache = grid(rand.nextInt(GRID_COUNT)).cache(null); + GridCache<Integer, String> cache = grid(rand.nextInt(GRID_COUNT)).cache(null); assertTrue(cache.get(i).equals(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java index a71e163..6f60e56 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java @@ -152,7 +152,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb info("Getting " + cnt + " keys from cache."); for (int i = 0; i < cnt; i++) { - Cache<Integer, String> cache = grid(0).cache(null); + GridCache<Integer, String> cache = grid(0).cache(null); assertTrue(cache.get(i).equals(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java index 46f930f..2e95b08 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java @@ -109,7 +109,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends try { startGrid(); - Cache<String, String> c = cache(); + GridCache<String, String> c = cache(); MockEntry e1 = new MockEntry("1", c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index f12bb5a..8e5f331 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -760,7 +760,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @throws Exception If failed. */ private Collection<Integer> keys() throws Exception { - Cache<Integer, Object> cache = cache(0); + GridCache<Integer, Object> cache = cache(0); ArrayList<Integer> keys = new ArrayList<>(); @@ -809,7 +809,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } }, 3000); - Cache<Integer, Object> cache = cache(0); + GridCache<Integer, Object> cache = cache(0); for (int i = 0; i < gridCount(); i++) { ClusterNode node = grid(i).cluster().localNode(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java index a2fd5a1..5beb191 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java @@ -191,7 +191,7 @@ public abstract class IgniteCacheNoLoadPreviousValueAbstractTest extends IgniteC * @throws Exception If failed. */ protected Collection<Integer> keys() throws Exception { - Cache<Integer, Object> cache = cache(0); + GridCache<Integer, Object> cache = cache(0); ArrayList<Integer> keys = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java index 400e60d..02fecb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java @@ -301,7 +301,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb * @throws Exception If failed. */ protected Collection<Integer> keys() throws Exception { - Cache<Integer, Object> cache = cache(0); + GridCache<Integer, Object> cache = cache(0); ArrayList<Integer> keys = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java index 93fdb9d..96d1e3f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java @@ -325,7 +325,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA * @throws Exception If failed. */ protected Collection<Integer> keys() throws Exception { - Cache<Integer, Object> cache = cache(0); + GridCache<Integer, Object> cache = cache(0); ArrayList<Integer> keys = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index 12d09fe..ade621c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -43,10 +43,10 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte private static Ignite ignite; /** Regular cache. */ - private static Cache<Integer, Object> cache; + private static GridCache<Integer, Object> cache; /** Offheap cache. */ - private static Cache<Integer, Object> cacheOffheap; + private static GridCache<Integer, Object> cacheOffheap; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -208,7 +208,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val Value. * @throws Exception If failed. */ - private void testTransaction(Cache<Integer, Object> cache, IgniteTxConcurrency concurrency, + private void testTransaction(GridCache<Integer, Object> cache, IgniteTxConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed(cache, concurrency, key, val, null, null); } @@ -224,7 +224,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed(Cache<Integer, Object> cache, IgniteTxConcurrency concurrency, + private void testTransactionMixed(GridCache<Integer, Object> cache, IgniteTxConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { IgniteTx tx = cache.txStart(concurrency, 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/local/GridCacheLocalFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java index ccbdf14..48497b9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java @@ -97,7 +97,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT if (!txEnabled() || portableEnabled()) return; - final Cache<String, Integer> myCache = cache(); + final GridCache<String, Integer> myCache = cache(); final AtomicLong cntr = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index 154754c..e422da0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -132,7 +132,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { IgniteTx tx = null; try { - Cache<Integer, String> cache = ignite.cache(null); + GridCache<Integer, String> cache = ignite.cache(null); tx = cache.txStart(concurrency, isolation, 50, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 6cafe63..0040e75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -140,7 +140,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private void checkQuery(Cache cache) throws Exception { + private void checkQuery(GridCache cache) throws Exception { final int ENTRY_CNT = 500; for (int i = 0; i < ENTRY_CNT; i++) @@ -191,7 +191,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings({"unchecked", "IfMayBeConditional"}) - private void checkProjectionFilter(Cache cache, int expCnt) throws Exception { + private void checkProjectionFilter(GridCache cache, int expCnt) throws Exception { CacheProjection prj; if (portableEnabled()) { @@ -243,7 +243,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @param expCnt Expected entries in query result. * @throws Exception If failed. */ - private void testMultithreaded(final Cache cache, final int expCnt) throws Exception { + private void testMultithreaded(final GridCache cache, final int expCnt) throws Exception { log.info("Starting multithreaded queries."); GridTestUtils.runMultiThreaded(new Callable<Void>() { @@ -287,7 +287,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private void checkQueryPrimitives(Cache cache) throws Exception { + private void checkQueryPrimitives(GridCache cache) throws Exception { final int ENTRY_CNT = 500; for (int i = 0; i < ENTRY_CNT; i++) @@ -343,7 +343,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private void checkQueryValueByteArray(Cache cache) throws Exception { + private void checkQueryValueByteArray(GridCache cache) throws Exception { final int ENTRY_CNT = 100; for (int i = 0; i < ENTRY_CNT; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index d5119c4..5a5beae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; 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.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; @@ -351,7 +351,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testAllEntries() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); @@ -425,7 +425,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testEntriesByFilter() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); @@ -520,7 +520,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testProjection() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); // Queries for non-partitioned caches always run locally. if (cache.configuration().getCacheMode() != PARTITIONED) @@ -599,7 +599,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLocalNodeOnly() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); // Queries for non-partitioned caches always run locally. if (cache.configuration().getCacheMode() != PARTITIONED) @@ -678,7 +678,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testStopByCallback() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); @@ -752,7 +752,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testBuffering() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); // Buffering make sense only for remote nodes, so test only for partitioned cache. if (cache.configuration().getCacheMode() != PARTITIONED) @@ -845,7 +845,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testTimeInterval() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); // Buffering make sense only for remote nodes, so test only for partitioned cache. if (cache.configuration().getCacheMode() != PARTITIONED) @@ -933,7 +933,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testIteration() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); @@ -975,7 +975,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testIterationAndUpdates() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); @@ -1019,7 +1019,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLoadCache() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); @@ -1060,7 +1060,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testTypedProjection() throws Exception { - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.projection(Integer.class, Integer.class).queries().createContinuousQuery(); @@ -1224,7 +1224,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (atomicityMode() == ATOMIC) return; - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); CacheContinuousQuery<Object, Object> qry = cache.queries().createContinuousQuery(); @@ -1268,7 +1268,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If filter. */ public void testUpdateInFilter() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); cache.putx(1, 1); @@ -1318,7 +1318,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testNodeJoin() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); @@ -1361,7 +1361,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testCallbackForPreload() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); if (cache.configuration().getCacheMode() == LOCAL) return; @@ -1473,7 +1473,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo grid(i).events().localListen(execLsnr, EVT_CACHE_QUERY_EXECUTED); } - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); try (CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery()) { qry.localCallback(new IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java index 36d6e75..f2f50dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java @@ -46,9 +46,9 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu * @throws Exception If failed. */ public void testRemoteNodeCallback() throws Exception { - Cache<Integer, Integer> cache1 = grid(0).cache(null); + GridCache<Integer, Integer> cache1 = grid(0).cache(null); - Cache<Integer, Integer> cache2 = grid(1).cache(null); + GridCache<Integer, Integer> cache2 = grid(1).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache2.queries().createContinuousQuery(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 97e6192..a9928b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -113,14 +113,14 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom startGrid(gridCount()); - Cache<String, Organization> orgCache = grid(0).cache(null); + GridCache<String, Organization> orgCache = grid(0).cache(null); assert orgCache != null; assert orgCache.putx("o1", new Organization(1, "A")); assert orgCache.putx("o2", new Organization(2, "B")); - Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); + GridCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java index 176d912..afe7110 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -148,7 +148,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { Random rnd = new Random(); - Cache<Integer, String> c = g0.cache(null); + GridCache<Integer, String> c = g0.cache(null); for (int i = 0; i < KEYS_COUNT; i ++) { Integer k = rnd.nextInt(KEYS_COUNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java index f652a65..6910310 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.dataload; 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.eviction.fifo.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -638,7 +638,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { try { Ignite g = startGrid(); - final Cache<Integer, Integer> c = g.cache(null); + final GridCache<Integer, Integer> c = g.cache(null); final IgniteDataLoader<Integer, Integer> ldr = g.dataLoader(null); @@ -690,7 +690,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { try { Ignite g = startGrid(); - Cache<Integer, Integer> c = g.cache(null); + GridCache<Integer, Integer> c = g.cache(null); IgniteDataLoader<Integer, Integer> ldr = g.dataLoader(null); @@ -735,7 +735,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_PUT); - Cache<Integer, Integer> c = g.cache(null); + GridCache<Integer, Integer> c = g.cache(null); assertTrue(c.isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index b2fb15b..d6b7583 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -772,7 +772,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes @SuppressWarnings("ConstantConditions") public void _testFormat() throws Exception { GridKernal grid = (GridKernal)G.ignite("grid"); - Cache cache = grid.internalCache("dataCache"); + GridCache cache = grid.internalCache("dataCache"); if (dual) create(ggfsSecondary, paths(DIR, SUBDIR, DIR_NEW, SUBDIR_NEW), paths(FILE, FILE_NEW)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java index 75a05e1..0ec979d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java @@ -517,7 +517,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { * @param affinity Affinity block locations to check. */ private void checkAffinity(int blockSize, GridGgfsFileInfo info, Iterable<IgniteFsBlockLocation> affinity) { - Cache<Object, Object> dataCache = grid(0).cachex(DATA_CACHE_NAME); + GridCache<Object, Object> dataCache = grid(0).cachex(DATA_CACHE_NAME); for (IgniteFsBlockLocation loc : affinity) { info("Going to check GGFS block location: " + loc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java index 09b0219..6e969df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java @@ -1249,7 +1249,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT GridGgfsBlockKey key = new GridGgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(), 2); - Cache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache( + GridCache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache( ggfs.configuration().getDataCacheName()); for (int i = 0; i < 10; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java index 81c9f78..094ba2a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java @@ -61,7 +61,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { protected IgniteFs ggfs; /** Meta cache. */ - private Cache<Object, Object> metaCache; + private GridCache<Object, Object> metaCache; /** Meta cache name. */ private String metaCacheName; @@ -682,8 +682,8 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { IgniteUuid fileId = U.field(ggfs.info(path), "fileId"); - Cache<IgniteUuid, GridGgfsFileInfo> metaCache = grid(0).cachex(META_CACHE_NAME); - Cache<GridGgfsBlockKey, byte[]> dataCache = grid(0).cachex(DATA_CACHE_NAME); + GridCache<IgniteUuid, GridGgfsFileInfo> metaCache = grid(0).cachex(META_CACHE_NAME); + GridCache<GridGgfsBlockKey, byte[]> dataCache = grid(0).cachex(DATA_CACHE_NAME); GridGgfsFileInfo info = metaCache.get(fileId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java index 18f48c5..f279f86 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java @@ -489,7 +489,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { os.write(chunk((int)ggfsMaxData)); os.close(); - final Cache<IgniteUuid, GridGgfsFileInfo> metaCache = ggfs.context().kernalContext().cache().cache( + final GridCache<IgniteUuid, GridGgfsFileInfo> metaCache = ggfs.context().kernalContext().cache().cache( ggfs.configuration().getMetaCacheName()); // Start a transaction in a separate thread which will lock file ID. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java index c3b5c60..0e83221 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java @@ -152,8 +152,8 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { * @throws IgniteCheckedException In case of exception. */ public void testConfiguration() throws IgniteCheckedException { - Cache metaCache = getFieldValue(fs, "meta", "metaCache"); - Cache dataCache = getFieldValue(fs, "data", "dataCache"); + GridCache metaCache = getFieldValue(fs, "meta", "metaCache"); + GridCache dataCache = getFieldValue(fs, "data", "dataCache"); assertNotNull(metaCache); assertEquals(META_CACHE_NAME, metaCache.name()); @@ -255,7 +255,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { // After this we should have first two block colocated with grid 0 and last block colocated with grid 1. IgniteFsFileImpl fileImpl = (IgniteFsFileImpl)fs.info(path); - Cache<Object, Object> metaCache = grid(0).cachex(META_CACHE_NAME); + GridCache<Object, Object> metaCache = grid(0).cachex(META_CACHE_NAME); GridGgfsFileInfo fileInfo = (GridGgfsFileInfo)metaCache.get(fileImpl.fileId()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index 87815aa..f5e6c86 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -570,7 +570,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs private Ignite ignite; /** */ - private Cache<String, Value> cache; + private GridCache<String, Value> cache; /** Cache key. */ private String key;
