http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index 11d1d00..be7babc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; +import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java index 3cc4602..91b20fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java @@ -102,8 +102,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex() throws Exception { final Ignite g = startGrid(0); - final Cache<Integer, ObjectValue> cache1 = g.cache("local1"); - final Cache<Integer, ObjectValue> cache2 = g.cache("local2"); + final GridCache<Integer, ObjectValue> cache1 = g.cache("local1"); + final GridCache<Integer, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -159,8 +159,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex1() throws Exception { final Ignite g = startGrid(0); - final Cache<Integer, ObjectValue> cache1 = g.cache("local1"); - final Cache<Integer, ObjectValue> cache2 = g.cache("local2"); + final GridCache<Integer, ObjectValue> cache1 = g.cache("local1"); + final GridCache<Integer, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -230,8 +230,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex2() throws Exception { final Ignite g = startGrid(0); - final Cache<Integer, ObjectValue> cache1 = g.cache("local1"); - final Cache<Integer, ObjectValue> cache2 = g.cache("local2"); + final GridCache<Integer, ObjectValue> cache1 = g.cache("local1"); + final GridCache<Integer, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -303,8 +303,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex3() throws Exception { final Ignite g = startGrid(0); - final Cache<ObjectKey, ObjectValue> cache1 = g.cache("local1"); - final Cache<ObjectKey, ObjectValue> cache2 = g.cache("local2"); + final GridCache<ObjectKey, ObjectValue> cache1 = g.cache("local1"); + final GridCache<ObjectKey, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java index bbf605f..81b0ce2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -209,16 +209,16 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { final int all = cache + offheapSwap; // put - doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<Cache<String, Integer>>() { - @Override public void applyx(Cache<String, Integer> c) throws IgniteCheckedException { + doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<GridCache<String, Integer>>() { + @Override public void applyx(GridCache<String, Integer> c) throws IgniteCheckedException { for (int i = 0; i < all; i++) c.put(valueOf(i), i); } }); //putAll - doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<Cache<String, Integer>>() { - @Override public void applyx(Cache<String, Integer> c) throws IgniteCheckedException { + doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<GridCache<String, Integer>>() { + @Override public void applyx(GridCache<String, Integer> c) throws IgniteCheckedException { Map<String, Integer> m = new HashMap<>(); for (int i = 0; i < all; i++) @@ -237,12 +237,12 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { * @param x Cache modifier. * @throws IgniteCheckedException If failed. */ - void doTest(int cache, int offheapSwap, boolean offheapEmpty, boolean swapEmpty, CIX1<Cache<String, Integer>> x) throws Exception { + void doTest(int cache, int offheapSwap, boolean offheapEmpty, boolean swapEmpty, CIX1<GridCache<String, Integer>> x) throws Exception { ipFinder = new TcpDiscoveryVmIpFinder(true); startGrid(); - final Cache<String, Integer> c = cache(); + final GridCache<String, Integer> c = cache(); x.applyx(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java index 61b6154..68f0638 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java @@ -83,7 +83,7 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testMissingCommitVersion() throws Exception { - final Cache<Integer, Integer> cache = cache(); + final GridCache<Integer, Integer> cache = cache(); final int KEYS_PER_THREAD = 10_000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java index 23e9ef0..71497a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java @@ -91,7 +91,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT int key = rnd.nextInt(keys); - Cache<Integer, Integer> prj = grid(g).cache(null); + GridCache<Integer, Integer> prj = grid(g).cache(null); try (IgniteTx tx = prj.txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer val = prj.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index e0be3be..41ef1c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -131,7 +131,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { started.set(true); - Cache<Object, Object> c = g4.cache(null); + GridCache<Object, Object> c = g4.cache(null); info(">>>> Checking tx in new grid."); @@ -152,7 +152,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { assertFalse(started.get()); // Check we can proceed with transactions. - Cache<Object, Object> cache0 = g.cache(null); + GridCache<Object, Object> cache0 = g.cache(null); info(">>>> Checking tx commit."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java index 2a28d4b..b6d1fdb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java @@ -95,7 +95,7 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGridsMultiThreaded(gridCnt); - Cache<Integer, Integer> cache = ignite.cache(null); + GridCache<Integer, Integer> cache = ignite.cache(null); IgniteTx tx = cache.txStart(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java index 444da3e..f92005c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -105,7 +105,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTwoTx() throws Exception { - final Cache<String, Integer> c = grid(0).cache(null); + final GridCache<String, Integer> c = grid(0).cache(null); GridKernalContext ctx = ((GridKernal)grid(0)).context(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java index 9fccc8f..7d4b5cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -154,7 +154,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(0); try { - Cache<Object, Object> cache = g.cache(null); + GridCache<Object, Object> cache = g.cache(null); for (int i = 0; i < 10; 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/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java index 03c77b2..d24265c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java @@ -131,7 +131,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPut(final Integer key) throws Exception { - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -177,7 +177,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutxIfAbsent(final Integer key) throws Exception { - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -221,7 +221,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutWithFilter(final Integer key) throws Exception { - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -265,7 +265,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutGet(final Integer key) throws Exception { - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -327,7 +327,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend protected Integer keyForNode(int idx) { Integer key0 = null; - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 10_000; i++) { if (cache.affinity().isPrimary(grid(idx).localNode(), i)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java index 212afb3..718a406 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java @@ -123,7 +123,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -179,7 +179,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutWithFilterTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -235,7 +235,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutxIfAbsentTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 83f62fd..2ad1da1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -109,8 +109,8 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); - Cache<Integer, Object> cache1 = ignite1.cache(null); - Cache<Integer, Object> cache2 = ignite2.cache(null); + GridCache<Integer, Object> cache1 = ignite1.cache(null); + GridCache<Integer, Object> cache2 = ignite2.cache(null); Object v1 = new CacheValue(1); @@ -223,7 +223,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_TO_OFFHEAP, EVT_CACHE_OBJECT_FROM_OFFHEAP); - Cache<Integer, CacheValue> cache = grid(0).cache(null); + GridCache<Integer, CacheValue> cache = grid(0).cache(null); populate(cache); evictAll(cache); @@ -286,7 +286,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { grid(0); - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) { info("Putting: " + i); @@ -359,7 +359,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void evictAll(Cache<Integer, CacheValue> cache) throws Exception { + private void evictAll(GridCache<Integer, CacheValue> cache) throws Exception { resetCounters(); assertEquals(ENTRY_CNT, cache.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java index 5c9eee6..4d0f755 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java @@ -180,7 +180,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - Cache<Integer, Integer> cache = g.cache(null); + GridCache<Integer, Integer> cache = g.cache(null); // int max = 17 * 1024 * 1024; int max = Integer.MAX_VALUE; @@ -210,7 +210,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - final Cache<Integer, Integer> c = g.cache(null); + final GridCache<Integer, Integer> c = g.cache(null); final 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/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index 1093dcc..bed5ffb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -87,7 +87,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testTransform() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); checkTransform(primaryKey(cache)); @@ -168,7 +168,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemove() throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemove(primaryKey(c)); @@ -181,7 +181,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemoveByteArray() throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemoveByteArray(primaryKey(c)); @@ -195,7 +195,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemove(Integer key) throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); checkValue(key, null); @@ -219,7 +219,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveByteArray(Integer key) throws Exception { - Cache<Integer, byte[]> c = grid(0).cache(null); + GridCache<Integer, byte[]> c = grid(0).cache(null); checkValue(key, null); @@ -246,7 +246,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); @@ -271,7 +271,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveTxByteArray(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { - Cache<Integer, byte[]> c = grid(0).cache(null); + GridCache<Integer, byte[]> c = grid(0).cache(null); IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); @@ -296,7 +296,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPromote() throws Exception { - Cache<Integer, TestValue> c = grid(0).cache(null); + GridCache<Integer, TestValue> c = grid(0).cache(null); TestValue val = new TestValue(new byte[100 * 1024]); @@ -390,7 +390,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb for (int i = 0; i < 100; i++) map.put(i, i); - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); Map<Integer, Integer> map0 = c.getAll(map.keySet()); @@ -427,7 +427,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemoveObject() throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemoveObject(primaryKey(c)); @@ -441,7 +441,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveObject(Integer key) throws Exception { - Cache<Integer, TestValue> c = grid(0).cache(null); + GridCache<Integer, TestValue> c = grid(0).cache(null); checkValue(key, null); @@ -480,7 +480,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveObjectTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { - Cache<Integer, TestValue> c = grid(0).cache(null); + GridCache<Integer, TestValue> c = grid(0).cache(null); TestValue val = new TestValue(new byte[10]); @@ -508,7 +508,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb if (atomicityMode() == ATOMIC) return; - Cache<Integer, TestValue> c = grid(0).cache(null); + GridCache<Integer, TestValue> c = grid(0).cache(null); checkLockUnlock(primaryKey(c)); @@ -565,7 +565,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testUnswap() throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); checkUnswap(primaryKey(c)); @@ -579,7 +579,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkUnswap(Integer key) throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < gridCount(); i++) { assertEquals("Unexpected entries for grid: " + i, 0, grid(i).cache(null).offHeapEntriesCount()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java index 0fc2c83..929c8e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java @@ -91,7 +91,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri @Override protected void beforeTest() throws Exception { super.beforeTest(); - final Cache<Integer, Object> cache = grid(0).cache(null); + final GridCache<Integer, Object> cache = grid(0).cache(null); vals = new ArrayList<>(VALS); @@ -128,7 +128,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testPut() throws Exception { - final Cache<Integer, Object> cache = grid(0).cache(null); + final GridCache<Integer, Object> cache = grid(0).cache(null); GridTestUtils.runMultiThreaded(new Callable<Void>() { @Override public Void call() throws Exception { @@ -153,7 +153,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testRemove() throws Exception { - final Cache<Integer, Object> cache = grid(0).cache(null); + final GridCache<Integer, Object> cache = grid(0).cache(null); GridTestUtils.runMultiThreaded(new Callable<Void>() { @Override public Void call() 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/GridCacheOffheapUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java index cfd4c70..dbe0b4b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java @@ -57,14 +57,14 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrids(2); - Cache<Object, Object> rmtCache = ignite.cache(null); + GridCache<Object, Object> rmtCache = ignite.cache(null); int key = 0; while (!rmtCache.affinity().isPrimary(grid(1).localNode(), key)) key++; - Cache<Object, Object> locCache = grid(1).cache(null); + GridCache<Object, Object> locCache = grid(1).cache(null); try (IgniteTx tx = locCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { locCache.putxIfAbsent(key, 0); @@ -100,7 +100,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { try { Ignite grid = startGrid(0); - Cache<Object, Object> cache = grid.cache(null); + GridCache<Object, Object> cache = grid.cache(null); for (int i = 0; i < 30; i++) cache.put(i, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java index 78a3684..c2cab27 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java @@ -126,7 +126,7 @@ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(0); try { - Cache<Object, Object> cache = g.cache("first"); + GridCache<Object, Object> cache = g.cache("first"); // Put some data into cache. for (int i = 0; i < 1000; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java index 74764a0..a819ab8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -206,8 +206,8 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { Ignite ignite1 = startGrid(1); GridKernal grid2 = (GridKernal)startGrid(2); - Cache<Integer, Object> cache1 = ignite1.cache(cacheName); - Cache<Integer, Object> cache2 = grid2.cache(cacheName); + GridCache<Integer, Object> cache1 = ignite1.cache(cacheName); + GridCache<Integer, Object> cache2 = grid2.cache(cacheName); Object v1 = valCls.newInstance(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java index 31864c3..f25218a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java @@ -117,7 +117,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromPrimaryNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - Cache<String, Integer> c = grid(i).cache(null); + GridCache<String, Integer> c = grid(i).cache(null); CacheEntry<String, Integer> e = c.entry(KEY); @@ -138,7 +138,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromBackupNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - Cache<String, Integer> c = grid(i).cache(null); + GridCache<String, Integer> c = grid(i).cache(null); CacheEntry<String, Integer> e = c.entry(KEY); @@ -171,7 +171,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromNearNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - Cache<String, Integer> c = grid(i).cache(null); + GridCache<String, Integer> c = grid(i).cache(null); CacheEntry<String, Integer> e = c.entry(KEY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java index 027d044..759843f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache; 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.*; @@ -102,7 +102,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { startGrid(); - Cache<Integer, String> cache = cache(); + GridCache<Integer, String> cache = cache(); try { cache.get(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java index 62f12a7..cf164d4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java @@ -100,7 +100,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest try { final Ignite ignite1 = startGrid(1); - Cache<Integer, Object> cache1 = ignite1.cache(null); + GridCache<Integer, Object> cache1 = ignite1.cache(null); for (int i = 0; i < 5000; i++) cache1.put(i, VALUE + i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java index e2352ae..bea2421 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java @@ -564,7 +564,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { Collection<Integer> ret = new ArrayList<>(keys.size()); - Cache<Object, Object> cache = workerNode.cache(CACHE_NAME); + GridCache<Object, Object> cache = workerNode.cache(CACHE_NAME); for (Integer key : keys) { if (cache.get(key) == null) // Key is absent. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java index b44cd9a..dcd2acf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java @@ -49,7 +49,7 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { * @throws Exception If failed. */ public void testWithoutStoreLoad() throws Exception { - Cache<Integer, CacheValue> cache = grid(0).cache(null); + GridCache<Integer, CacheValue> cache = grid(0).cache(null); for (int i = 0; i < ENTRY_CNT; i++) cache.put(i, new CacheValue(i)); @@ -65,7 +65,7 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { for (int i = 0; i < ENTRY_CNT; i++) putToStore(i, new CacheValue(i)); - Cache<Integer, CacheValue> cache0 = grid(0).cache(null); + GridCache<Integer, CacheValue> cache0 = grid(0).cache(null); cache0.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/GridCacheQueryInternalKeysSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java index aaf73fa..10e60c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java @@ -67,7 +67,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes @SuppressWarnings("unchecked") public void testInternalKeysPreloading() throws Exception { try { - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < ENTRY_CNT; i++) cache.dataStructures().queue("queue" + i, Integer.MAX_VALUE, false, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java index 02eeeec..97b2ba3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -312,7 +312,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - Cache<Integer, TestValue> cache = g.cache(null); + GridCache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -353,7 +353,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - Cache<Integer, TestValue> cache = g.cache(null); + GridCache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -386,7 +386,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - Cache<Integer, TestValue> cache = g.cache(null); + GridCache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -426,7 +426,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - Cache<Integer, TestValue> cache = g.cache(null); + GridCache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -463,7 +463,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - Cache<Integer, TestValue> cache = g.cache(null); + GridCache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java index 1f27160..b93d9a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache; 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.lru.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -164,7 +164,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { Ignite ignite = startGrid(); try { - Cache<Integer, Integer> cache = ignite.cache(CACHE_NAME); + GridCache<Integer, Integer> cache = ignite.cache(CACHE_NAME); for (int i = 0; i < N_ENTRIES; 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/GridCacheReplicatedSynchronousCommitTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java index 4750948..77ab9a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java @@ -104,7 +104,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract try { Ignite firstIgnite = startGrid("1"); - Cache<Integer, String> firstCache = firstIgnite.cache(null); + GridCache<Integer, String> firstCache = firstIgnite.cache(null); for (int i = 0; i < ADDITION_CACHE_NUMBER; i++) startGrid(String.valueOf(i + 2)); @@ -134,8 +134,8 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract Ignite ignite3 = startGrid("3"); - Cache<Integer, String> cache1 = ignite1.cache(null); - Cache<Integer, String> cache3 = ignite3.cache(null); + GridCache<Integer, String> cache1 = ignite1.cache(null); + GridCache<Integer, String> cache3 = ignite3.cache(null); IgniteFuture<?> fut = multithreadedAsync( new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java index 66fa493..140063a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java @@ -114,7 +114,7 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest { cache.context().tm().slowTxWarnTimeout(500); } - Cache<Object, Object> cache1 = g.cache(cacheName); + GridCache<Object, Object> cache1 = g.cache(cacheName); IgniteTx tx = cache1.txStart(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java index 51fc5a4..b051b80 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java @@ -131,7 +131,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { final CountDownLatch readyLatch = new CountDownLatch(PUT_THREADS); - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).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/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java index 4c024c6..641313e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache; 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.*; @@ -100,7 +100,7 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testPutxShouldNotTriggerLoadWithTx() throws Exception { - Cache<Integer, Integer> cache = cache(); + GridCache<Integer, Integer> cache = cache(); try (IgniteTx tx = cache.txStart()) { assertTrue(cache.putx(1, 1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java index 311f394..1fcda7e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java @@ -78,7 +78,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { Ignite g0 = startGrid(0); Ignite g1 = startGrid(1); - Cache<Integer, String> c = g0.cache(null); + GridCache<Integer, String> c = g0.cache(null); c.put(1, "Cached value"); @@ -99,7 +99,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { Ignite g0 = startGrid(0); Ignite g1 = startGrid(1); - Cache<Integer, String> c = g0.cache(null); + GridCache<Integer, String> c = g0.cache(null); c.put(1, "Cached value"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java index 14247b7..d6a77c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java @@ -96,7 +96,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { try { startGrid(0); - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); // Populate. for (int i = 0; i < ENTRY_CNT; i++) @@ -154,7 +154,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { try { startGrid(0); - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).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/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java index 902b45e..b983c07 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; +import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index 1d6d3b5..013500f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -206,7 +206,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid */ private void testCommits(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { IgniteTx tx = cache.txStart(concurrency, isolation); @@ -246,7 +246,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid */ private void testRollbacks(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { IgniteTx tx = cache.txStart(concurrency, isolation); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java index a97a7a5..dabbef2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java @@ -109,7 +109,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach public void testPutRemove() throws Exception { awaitPartitionMapExchange(); - Cache<String, Integer> cache = cache(); + GridCache<String, Integer> cache = cache(); int keyCnt = 10; @@ -117,7 +117,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach cache.put("key" + i, i); for (int g = 0; g < gridCount(); g++) { - Cache<String, Integer> cache0 = cache(g); + GridCache<String, Integer> cache0 = cache(g); ClusterNode locNode = grid(g).localNode(); for (int i = 0; i < keyCnt; i++) { @@ -148,7 +148,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach assertEquals((Integer)i, cache.remove("key" + i)); for (int g = 0; g < gridCount(); g++) { - Cache<String, Integer> cache0 = cache(g); + GridCache<String, Integer> cache0 = cache(g); for (int i = 0; i < keyCnt; i++) { String key = "key" + i; @@ -166,7 +166,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach public void testPutRemoveAll() throws Exception { awaitPartitionMapExchange(); - Cache<String, Integer> cache = cache(); + GridCache<String, Integer> cache = cache(); int keyCnt = 10; @@ -177,7 +177,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach } for (int g = 0; g < gridCount(); g++) { - Cache<String, Integer> cache0 = cache(g); + GridCache<String, Integer> cache0 = cache(g); ClusterNode locNode = grid(g).localNode(); for (int i = 0; i < keyCnt; i++) { @@ -211,7 +211,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach info(">>>> Starting values check"); for (int g = 0; g < gridCount(); g++) { - Cache<String, Integer> cache0 = cache(g); + GridCache<String, Integer> cache0 = cache(g); for (int i = 0; i < keyCnt; i++) { String key = "key" + i; @@ -246,7 +246,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach Ignite ignite = grid(g); - Cache<Object, Object> cache = ignite.cache(null); + GridCache<Object, Object> cache = ignite.cache(null); int k = rnd.nextInt(range); @@ -299,7 +299,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach * @param g Grid to check. */ private void checkKeySet(Ignite g) { - Cache<Object, Object> cache = g.cache(null); + GridCache<Object, Object> cache = g.cache(null); Set<Object> keys = cache.keySet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 69b93f7..457c7b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -123,7 +123,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { @SuppressWarnings({"BusyWait"}) @Override public void applyx() throws IgniteCheckedException { while (cnt++ < txCnt && !done.get()) { - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); if (cnt % logMod == 0) info("Starting transaction: " + cnt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index 23def1a..432c34d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -62,7 +62,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - Cache<?, ?> cache = cache(); + GridCache<?, ?> cache = cache(); if (cache != null) cache.clearAll(); @@ -107,7 +107,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb /** @throws Exception If test fails. */ public void testWriteThrough() throws Exception { - Cache<Integer, String> cache = cache(); + GridCache<Integer, String> cache = cache(); Map<Integer, String> map = store.getMap(); @@ -172,7 +172,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb /** @throws Exception If test failed. */ public void testReadThrough() throws Exception { - Cache<Integer, String> cache = cache(); + GridCache<Integer, String> cache = cache(); Map<Integer, String> map = store.getMap(); @@ -268,7 +268,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb final AtomicBoolean running = new AtomicBoolean(true); - final Cache<Integer, String> cache = cache(); + final GridCache<Integer, String> cache = cache(); IgniteFuture<?> fut = multithreadedAsync(new Runnable() { @SuppressWarnings({"NullableProblems"}) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index f66331c..2d97c04 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -138,7 +138,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private void checkSingleWrites() throws Exception { prepare(); - Cache<Integer, String> cache = grid(0).cache(null); + GridCache<Integer, String> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) cache.put(i, String.valueOf(i)); @@ -168,7 +168,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private void checkTxWrites() throws Exception { prepare(); - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { for (int i = 0; i < 100; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 019829d..b27cf5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; +import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index fa307f4..29c7781 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -822,7 +822,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest 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/IgniteCacheInvokeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java index 708dc82..6c4aa4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java @@ -487,7 +487,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT * @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/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java index 4fe7e86..c4dca58 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java @@ -127,7 +127,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @return Cache. */ @SuppressWarnings("unchecked") - @Override protected Cache<Integer, String> cache(int i) { + @Override protected GridCache<Integer, String> cache(int i) { return grid(i).cache(null); } @@ -173,7 +173,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { debug("Checking commit on grid: " + ignite.cluster().localNode().id()); for (int i = 0; i < iterations(); i++) { - Cache<Integer, String> cache = cache(gridIdx); + GridCache<Integer, String> cache = cache(gridIdx); IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0); @@ -310,7 +310,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { debug("Checking commit on grid: " + ignite.cluster().localNode().id()); for (int i = 0; i < iterations(); i++) { - Cache<Integer, String> cache = cache(gridIdx); + GridCache<Integer, String> cache = cache(gridIdx); IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0); @@ -413,7 +413,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { String v1 = null; for (int j = 0; j < gridCount(); j++) { - Cache<Integer, String> cache = cache(j); + GridCache<Integer, String> cache = cache(j); IgniteTx tx = cache.tx(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 2c7ed2f..6aa8acb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.Cache; +import org.apache.ignite.cache.GridCache; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -283,7 +283,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); if (putBefore) { idxSpi.forceFail(false); @@ -538,7 +538,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @return Key. */ private Integer keyForNode(ClusterNode node, int type) { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); if (cache.configuration().getCacheMode() == LOCAL) return ++lastKey; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 36ecc31..719b7fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -157,7 +157,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onItemNear(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteCheckedException { - Cache<String, Integer> cache = ignite.cache(null); + GridCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID itemPrimaryId = primaryId(ignite, itemKey); @@ -209,7 +209,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onItemPrimary(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteCheckedException { - Cache<String, Integer> cache = ignite.cache(null); + GridCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID itemPrimaryId = primaryId(ignite, itemKey); @@ -262,7 +262,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onRemoveItemQueried(boolean putCntr, Ignite ignite, int retry) throws IgniteCheckedException { - Cache<String, Integer> cache = ignite.cache(null); + GridCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY); @@ -352,7 +352,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onRemoveItemSimple(boolean putCntr, Ignite ignite, int retry) throws IgniteCheckedException { - Cache<String, Integer> cache = ignite.cache(null); + GridCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY); @@ -629,7 +629,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - Cache<String, Integer> cache = grid(0).cache(null); + GridCache<String, Integer> cache = grid(0).cache(null); cache.put(RMVD_CNTR_KEY, 0); @@ -670,7 +670,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - Cache<String, Integer> cache = grid(0).cache(null); + GridCache<String, Integer> cache = grid(0).cache(null); cache.put(RMVD_CNTR_KEY, 0); @@ -721,7 +721,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe try { startGrids(GRID_CNT); - Cache<String, Integer> cache = grid(0).cache(null); + GridCache<String, Integer> cache = grid(0).cache(null); // Store counter. cache.put(RMVD_CNTR_KEY, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index c723c9b..af541c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -208,7 +208,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract */ // TODO: GG-8063, enabled when fixed. public void _testOptimisticSerializableConsistency() throws Exception { - final Cache<Integer, Long> cache = grid(0).cache(null); + final GridCache<Integer, Long> cache = grid(0).cache(null); final int THREADS = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java index a498cb9..5373ea0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java @@ -96,7 +96,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract startGrids(gridCount()); try { - Cache<Object, Object> cache = grid(0).cache(null); + GridCache<Object, Object> cache = grid(0).cache(null); // Find test key. int key = testKey(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index c532cb5..afe9afe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache; 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.cluster.*; import org.apache.ignite.configuration.*; @@ -286,7 +286,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); if (putBefore) { store.forceFail(false); @@ -547,7 +547,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @return Key. */ private Integer keyForNode(ClusterNode node, int type) { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); if (cache.configuration().getCacheMode() == LOCAL) return ++lastKey; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java index 3cf6f32..f06f209 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java @@ -125,7 +125,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void createRemove(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -183,7 +183,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void incrementAndGet(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -216,7 +216,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void getAndIncrement(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -249,7 +249,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void decrementAndGet(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -282,7 +282,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void getAndDecrement(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -315,7 +315,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void getAndAdd(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -350,7 +350,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void addAndGet(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -385,7 +385,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void getAndSet(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -421,7 +421,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void compareAndSet(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); @@ -463,7 +463,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private void getAndSetInTx(String cacheName) throws Exception { info("Running test [name=" + getName() + ", cache=" + cacheName + ']'); - Cache cache = grid().cache(cacheName); + GridCache cache = grid().cache(cacheName); assertNotNull(cache); assertEquals(0, cache.primarySize()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java index 1bc9d5f..0e9fe83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.datastructures; 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.datastructures.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -198,7 +198,7 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo public void testNonPersistentMode() throws IgniteCheckedException { String atomicName = UUID.randomUUID().toString(); - Cache<Object, Object> cache = grid().cache(null); + GridCache<Object, Object> cache = grid().cache(null); assertNotNull(cache);
