http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 271ec5a..21b82b1 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 @@ -151,7 +151,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(0); try { - IgniteCache<Object, Object> cache = g.jcache(null); + IgniteCache<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/34046ec8/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 06b2441..65d2ce8 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; @@ -89,7 +88,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testTransform(final Integer key) throws Exception { - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -110,7 +109,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend }, THREADS, "transform"); for (int i = 0; i < gridCount(); i++) { - Integer val = (Integer)grid(i).jcache(null).get(key); + Integer val = (Integer)grid(i).cache(null).get(key); assertEquals("Unexpected value for grid " + i, (Integer)(ITERATIONS_PER_THREAD * THREADS), val); } @@ -133,7 +132,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPut(final Integer key) throws Exception { - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -156,7 +155,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend }, THREADS, "put"); for (int i = 0; i < gridCount(); i++) { - Integer val = (Integer)grid(i).jcache(null).get(key); + Integer val = (Integer)grid(i).cache(null).get(key); assertNotNull("Unexpected value for grid " + i, val); } @@ -179,7 +178,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutxIfAbsent(final Integer key) throws Exception { - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -200,7 +199,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend }, THREADS, "putxIfAbsent"); for (int i = 0; i < gridCount(); i++) { - Integer val = (Integer)grid(i).jcache(null).get(key); + Integer val = (Integer)grid(i).cache(null).get(key); assertEquals("Unexpected value for grid " + i, (Integer)0, val); } @@ -223,7 +222,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutGet(final Integer key) throws Exception { - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -272,7 +271,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend getFut.get(); for (int i = 0; i < gridCount(); i++) { - Integer val = (Integer)grid(i).jcache(null).get(key); + Integer val = (Integer)grid(i).cache(null).get(key); assertNotNull("Unexpected value for grid " + i, val); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 60fed05..021b88f 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 @@ -56,7 +56,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testTransformTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception { - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -83,7 +83,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea }, THREADS, "transform"); for (int i = 0; i < gridCount(); i++) { - Integer val = (Integer)grid(i).jcache(null).get(key); + Integer val = (Integer)grid(i).cache(null).get(key); if (txConcurrency == PESSIMISTIC) assertEquals("Unexpected value for grid " + i, (Integer)(ITERATIONS_PER_THREAD * THREADS), val); @@ -93,7 +93,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (failed) { for (int g = 0; g < gridCount(); g++) - info("Value for cache [g=" + g + ", val=" + grid(g).jcache(null).get(key) + ']'); + info("Value for cache [g=" + g + ", val=" + grid(g).cache(null).get(key) + ']'); assertFalse(failed); } @@ -122,7 +122,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception { - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -149,7 +149,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea }, THREADS, "put"); for (int i = 0; i < gridCount(); i++) { - Integer val = (Integer)grid(i).jcache(null).get(key); + Integer val = (Integer)grid(i).cache(null).get(key); assertNotNull("Unexpected value for grid " + i, val); } @@ -178,7 +178,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutxIfAbsentTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception { - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -203,7 +203,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea }, THREADS, "putxIfAbsent"); for (int i = 0; i < gridCount(); i++) { - Integer val = (Integer)grid(i).jcache(null).get(key); + Integer val = (Integer)grid(i).cache(null).get(key); assertEquals("Unexpected value for grid " + i, (Integer)0, val); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 acb8345..6d4e0e9 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 @@ -32,7 +32,6 @@ import java.util.concurrent.locks.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; @@ -78,7 +77,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testTransform() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); checkTransform(primaryKey(cache)); @@ -92,7 +91,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkTransform(Integer key) throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); c.invoke(key, new EntryProcessor<Integer, Integer, Void>() { @Override public Void process(MutableEntry<Integer, Integer> e, Object... args) { @@ -159,7 +158,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemove() throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemove(primaryKey(c)); @@ -172,7 +171,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemoveByteArray() throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemoveByteArray(primaryKey(c)); @@ -186,7 +185,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemove(Integer key) throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); checkValue(key, null); @@ -210,7 +209,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveByteArray(Integer key) throws Exception { - IgniteCache<Integer, byte[]> c = grid(0).jcache(null); + IgniteCache<Integer, byte[]> c = grid(0).cache(null); checkValue(key, null); @@ -237,7 +236,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveTx(Integer key, TransactionConcurrency txConcurrency) throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); @@ -262,7 +261,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveTxByteArray(Integer key, TransactionConcurrency txConcurrency) throws Exception { - IgniteCache<Integer, byte[]> c = grid(0).jcache(null); + IgniteCache<Integer, byte[]> c = grid(0).cache(null); Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); @@ -287,7 +286,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPromote() throws Exception { - IgniteCache<Integer, TestValue> c = grid(0).jcache(null); + IgniteCache<Integer, TestValue> c = grid(0).cache(null); TestValue val = new TestValue(new byte[100 * 1024]); @@ -314,7 +313,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb for (int i = 0; i < 100; i++) map.put(i, i); - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); Map<Integer, Integer> map0 = c.getAll(map.keySet()); @@ -373,7 +372,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb for (int i = 0; i < 100; i++) map.put(i, i); - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); Map<Integer, Integer> map0 = c.getAll(map.keySet()); @@ -410,7 +409,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemoveObject() throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemoveObject(primaryKey(c)); @@ -424,7 +423,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveObject(Integer key) throws Exception { - IgniteCache<Integer, TestValue> c = grid(0).jcache(null); + IgniteCache<Integer, TestValue> c = grid(0).cache(null); checkValue(key, null); @@ -463,7 +462,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveObjectTx(Integer key, TransactionConcurrency txConcurrency) throws Exception { - IgniteCache<Integer, TestValue> c = grid(0).jcache(null); + IgniteCache<Integer, TestValue> c = grid(0).cache(null); TestValue val = new TestValue(new byte[10]); @@ -491,7 +490,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb if (atomicityMode() == ATOMIC) return; - IgniteCache<Integer, TestValue> c = grid(0).jcache(null); + IgniteCache<Integer, TestValue> c = grid(0).cache(null); checkLockUnlock(primaryKey(c)); @@ -506,7 +505,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb */ @SuppressWarnings("UnnecessaryLocalVariable") private void checkLockUnlock(Integer key) throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); Integer val = key; @@ -539,10 +538,10 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb if (val != null && val.getClass() == byte[].class) { Assert.assertArrayEquals("Unexpected value for grid: " + i, (byte[])val, - (byte[])grid(i).jcache(null).get(key)); + (byte[])grid(i).cache(null).get(key)); } else - assertEquals("Unexpected value for grid: " + i, val, grid(i).jcache(null).get(key)); + assertEquals("Unexpected value for grid: " + i, val, grid(i).cache(null).get(key)); } } @@ -550,7 +549,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testUnswap() throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); checkUnswap(primaryKey(c)); @@ -564,7 +563,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkUnswap(Integer key) throws Exception { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < gridCount(); i++) { assertEquals("Unexpected entries for grid: " + i, 0, internalCache(i).offHeapEntriesCount()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 0cfb7c2..5dbf079 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 @@ -76,7 +76,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri @Override protected void beforeTest() throws Exception { super.beforeTest(); - final IgniteCache<Integer, Object> cache = grid(0).jcache(null); + final IgniteCache<Integer, Object> cache = grid(0).cache(null); vals = new ArrayList<>(VALS); @@ -115,7 +115,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testPut() throws Exception { - final IgniteCache<Integer, Object> cache = grid(0).jcache(null); + final IgniteCache<Integer, Object> cache = grid(0).cache(null); GridTestUtils.runMultiThreaded(new Callable<Void>() { @Override public Void call() throws Exception { @@ -141,7 +141,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testRemove() throws Exception { - final IgniteCache<Integer, Object> cache = grid(0).jcache(null); + final IgniteCache<Integer, Object> cache = grid(0).cache(null); GridTestUtils.runMultiThreaded(new Callable<Void>() { @Override public Void call() throws Exception { @@ -167,7 +167,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testTransform() throws Exception { - final IgniteCache<Integer, Object> cache = grid(0).jcache(null); + final IgniteCache<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/34046ec8/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 7853726..057df54 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); - IgniteCache<Object, Object> rmtCache = ignite.jcache(null); + IgniteCache<Object, Object> rmtCache = ignite.cache(null); int key = 0; while (!ignite.affinity(null).isPrimary(grid(1).localNode(), key)) key++; - IgniteCache<Object, Object> locCache = grid(1).jcache(null); + IgniteCache<Object, Object> locCache = grid(1).cache(null); try (Transaction tx = grid(1).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { locCache.putIfAbsent(key, 0); @@ -100,7 +100,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { try { Ignite grid = startGrid(0); - IgniteCache<Object, Object> cache = grid.jcache(null); + IgniteCache<Object, Object> cache = grid.cache(null); for (int i = 0; i < 30; i++) cache.put(i, 0); @@ -110,7 +110,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { awaitPartitionMapExchange(); for (int i = 0; i < 30; i++) - grid(1).jcache(null).put(i, 10); + grid(1).cache(null).put(i, 10); // Find a key that does not belong to started node anymore. int key = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java index faab855..3ef8dc3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java @@ -123,7 +123,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr * @throws Exception If failed. */ public void testInterceptor() throws Exception { - IgniteCache<TestKey, TestValue> cache = grid(0).jcache(null); + IgniteCache<TestKey, TestValue> cache = grid(0).cache(null); for (int i = 0; i < ITER_CNT; i++) { final TestValue val = new TestValue(i); @@ -208,7 +208,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr * @throws Exception If failed. */ public void testInvokeAndInterceptor() throws Exception { - IgniteCache<TestKey, TestValue> cache = grid(0).jcache(null); + IgniteCache<TestKey, TestValue> cache = grid(0).cache(null); for (int i = 0; i < ITER_CNT; i++) cache.put(new TestKey(i, i), new TestValue(i)); @@ -264,7 +264,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr public void testPutGet() throws Exception { noInterceptor = true; - IgniteCache<TestKey, TestValue> cache = grid(0).jcache(null); + IgniteCache<TestKey, TestValue> cache = grid(0).cache(null); Map<TestKey, TestValue> map = new HashMap<>(); @@ -310,7 +310,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr public void testPutGetByteArray() throws Exception { noInterceptor = true; - IgniteCache<TestKey, byte[]> cache = grid(0).jcache(null); + IgniteCache<TestKey, byte[]> cache = grid(0).cache(null); Map<TestKey, byte[]> map = new HashMap<>(); @@ -356,7 +356,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr public void testPutGetImmutable() throws Exception { noInterceptor = true; - IgniteCache<TestImmutableKey, TestImmutableValue> cache = grid(0).jcache(null); + IgniteCache<TestImmutableKey, TestImmutableValue> cache = grid(0).cache(null); Map<TestImmutableKey, TestImmutableValue> map = new HashMap<>(); @@ -404,7 +404,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr public void testPutGetKnownImmutable() throws Exception { noInterceptor = true; - IgniteCache<String, Long> cache = grid(0).jcache(null); + IgniteCache<String, Long> cache = grid(0).cache(null); Map<String, Long> map = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 81ee250..125ea4a 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 { - IgniteCache<Object, Object> cache = g.jcache("first"); + IgniteCache<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/34046ec8/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 61e4f9d..4509630 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 @@ -202,8 +202,8 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { Ignite ignite1 = startGrid(1); IgniteKernal grid2 = (IgniteKernal)startGrid(2); - IgniteCache<Integer, Object> cache1 = ignite1.jcache(cacheName); - IgniteCache<Integer, Object> cache2 = grid2.jcache(cacheName); + IgniteCache<Integer, Object> cache1 = ignite1.cache(cacheName); + IgniteCache<Integer, Object> cache2 = grid2.cache(cacheName); Object v1 = valCls.newInstance(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 3af3131..488579c 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 @@ -115,7 +115,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromPrimaryNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - IgniteCache<String, Integer> c = grid(i).jcache(null); + IgniteCache<String, Integer> c = grid(i).cache(null); if (grid(i).affinity(null).isPrimary(grid(i).localNode(), KEY)) { info("Primary node: " + grid(i).localNode().id()); @@ -134,7 +134,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromBackupNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - IgniteCache<String, Integer> c = grid(i).jcache(null); + IgniteCache<String, Integer> c = grid(i).cache(null); if (grid(i).affinity(null).isBackup(grid(i).localNode(), KEY)) { info("Backup node: " + grid(i).localNode().id()); @@ -165,7 +165,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromNearNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - IgniteCache<String, Integer> c = grid(i).jcache(null); + IgniteCache<String, Integer> c = grid(i).cache(null); if (!grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), KEY)) { info("Near node: " + grid(i).localNode().id()); @@ -217,7 +217,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { info("Primary node: " + g.cluster().localNode().id()); // Put value. - g.jcache(null).put(KEY, VAL); + g.cache(null).put(KEY, VAL); // Register listener. ((IgniteKernal)g).context().io().addMessageListener( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 fd8143b..3624b58 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); - IgniteCache<Integer, Object> cache1 = ignite1.jcache(null); + IgniteCache<Integer, Object> cache1 = ignite1.cache(null); for (int i = 0; i < 5000; i++) cache1.put(i, VALUE + i); @@ -124,7 +124,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest Cache.Entry<Integer, Object> entry = randomEntry(ignite1); if (entry != null) - ignite1.jcache(null).localEvict(Collections.<Object>singleton(entry.getKey())); + ignite1.cache(null).localEvict(Collections.<Object>singleton(entry.getKey())); else info("Entry is null."); } @@ -192,8 +192,8 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest assertTrue(GridTestUtils.waitForCondition(new PA() { @Override public boolean apply() { - int size1 = ignite1.jcache(null).localSize(); - return size1 != oldSize && size1 == ignite2.jcache(null).localSize(); + int size1 = ignite1.cache(null).localSize(); + return size1 != oldSize && size1 == ignite2.cache(null).localSize(); } }, getTestTimeout())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 879298a..1b3dd2e 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 @@ -40,7 +40,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** @@ -340,7 +339,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { int primaryCacheSize = 0; for (Ignite g : runningWorkers) { - info(">>>>> " + g.jcache(CACHE_NAME).localSize()); + info(">>>>> " + g.cache(CACHE_NAME).localSize()); primaryCacheSize += ((IgniteKernal)g).internalCache(CACHE_NAME).primarySize(); } @@ -540,7 +539,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { int primaryCacheSize = 0; for (Ignite g : runningWorkers) { - info(">>>>> " + g.jcache(CACHE_NAME).localSize()); + info(">>>>> " + g.cache(CACHE_NAME).localSize()); primaryCacheSize += ((IgniteKernal)g).internalCache(CACHE_NAME).primarySize(); } @@ -562,7 +561,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { private Collection<Integer> findAbsentKeys(Ignite workerNode, Collection<Integer> keys) { Collection<Integer> ret = new ArrayList<>(keys.size()); - IgniteCache<Object, Object> cache = workerNode.jcache(CACHE_NAME); + IgniteCache<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/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java index 63da2a0..58e7ccb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java @@ -75,7 +75,7 @@ class GridCachePutAllTask extends ComputeTaskAdapter<Collection<Integer>, Void> @Override public Object execute() { log.info("Going to put data: " + data); - IgniteCache<Object, Object> cache = ignite.jcache(cacheName); + IgniteCache<Object, Object> cache = ignite.cache(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 6751baa..35de371 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 @@ -311,7 +311,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - IgniteCache<Integer, TestValue> cache = g.jcache(null); + IgniteCache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -352,7 +352,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - IgniteCache<Integer, TestValue> cache = g.jcache(null); + IgniteCache<Integer, TestValue> cache = g.cache(null); IgniteCache<Integer, TestValue> cacheAsync = cache.withAsync(); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -388,7 +388,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - IgniteCache<Integer, TestValue> cache = g.jcache(null); + IgniteCache<Integer, TestValue> cache = g.cache(null); IgniteCache<Integer, TestValue> cacheAsync = cache.withAsync(); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -431,7 +431,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - IgniteCache<Integer, TestValue> cache = g.jcache(null); + IgniteCache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -468,7 +468,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - IgniteCache<Integer, TestValue> cache = g.jcache(null); + IgniteCache<Integer, TestValue> cache = g.cache(null); IgniteCache<Integer, TestValue> cacheAsync = cache.withAsync(); refs.add(new WeakReference<Object>(cacheContext(cache))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 04afd8d..d6eed5a 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 @@ -26,7 +26,6 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.configuration.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; @@ -162,7 +161,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { Ignite ignite = startGrid(); try { - IgniteCache<Integer, Integer> cache = ignite.jcache(CACHE_NAME); + IgniteCache<Integer, Integer> cache = ignite.cache(CACHE_NAME); for (int i = 0; i < N_ENTRIES; i++) load(cache, i, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 f5ebfa5..6c04ed8 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"); - IgniteCache<Integer, String> firstCache = firstIgnite.jcache(null); + IgniteCache<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"); - IgniteCache<Integer, String> cache1 = ignite1.jcache(null); - IgniteCache<Integer, String> cache3 = ignite3.jcache(null); + IgniteCache<Integer, String> cache1 = ignite1.cache(null); + IgniteCache<Integer, String> cache3 = ignite3.cache(null); IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java index ec3b507..2b81711 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -140,7 +140,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest failDeserialization = false; // Get client grid. - IgniteCache<Integer, TestObject> cache = grid(2).jcache(null); + IgniteCache<Integer, TestObject> cache = grid(2).cache(null); if (backups > 0 && atomicityMode == ATOMIC) cache = ((IgniteCacheProxy<Integer, TestObject>)cache).flagOn(FORCE_TRANSFORM_BACKUP); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 827905e..49409fe 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 @@ -113,7 +113,7 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest { cache.context().tm().slowTxWarnTimeout(500); } - IgniteCache<Object, Object> cache1 = g.jcache(cacheName); + IgniteCache<Object, Object> cache1 = g.cache(cacheName); Transaction tx = g.transactions().txStart(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 27a1424..1d7c2bd 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 @@ -129,7 +129,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { final CountDownLatch readyLatch = new CountDownLatch(PUT_THREADS); - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 ef0169d..6b48679 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 @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -77,7 +76,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { Ignite g0 = startGrid(0); Ignite g1 = startGrid(1); - IgniteCache<Integer, String> c = g0.jcache(null); + IgniteCache<Integer, String> c = g0.cache(null); c.put(1, "Cached value"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 a4ac1da..f457ca6 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); - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); Set<Integer> keys = new HashSet<>(); @@ -122,7 +122,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { startGrid(1); - int size = grid(1).jcache(null).localSize(); + int size = grid(1).cache(null).localSize(); info("New node cache size: " + size); @@ -195,7 +195,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { done.set(true); - int size = grid(1).jcache(null).localSize(); + int size = grid(1).cache(null).localSize(); info("New node cache size: " + size); @@ -204,7 +204,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { int next = 0; - for (IgniteCache.Entry<Integer, Integer> e : grid(1).<Integer, Integer>jcache(null).localEntries()) + for (IgniteCache.Entry<Integer, Integer> e : grid(1).<Integer, Integer>cache(null).localEntries()) keySet.add(e.getKey()); for (Integer i : keySet) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 a2ae57e..a80c864 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 @@ -208,7 +208,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid */ private void testCommits(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put) throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { Transaction tx = grid(0).transactions().txStart(concurrency, isolation); @@ -225,7 +225,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int i = 0; i < gridCount(); i++) { TransactionMetrics metrics = grid(i).transactions().metrics(); - CacheMetrics cacheMetrics = grid(i).jcache(null).metrics(); + CacheMetrics cacheMetrics = grid(i).cache(null).metrics(); if (i == 0) { assertEquals(TX_CNT, metrics.txCommits()); @@ -253,7 +253,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid */ private void testRollbacks(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put) throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { Transaction tx = grid(0).transactions().txStart(concurrency, isolation); @@ -270,7 +270,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int i = 0; i < gridCount(); i++) { TransactionMetrics metrics = grid(i).transactions().metrics(); - CacheMetrics cacheMetrics = grid(i).jcache(null).metrics(); + CacheMetrics cacheMetrics = grid(i).cache(null).metrics(); assertEquals(0, metrics.txCommits()); assertEquals(0, cacheMetrics.getCacheTxCommits()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java index 1235a1d..2a5c5de 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java @@ -45,7 +45,7 @@ public class GridCacheTtlManagerLoadTest extends GridCacheTtlManagerSelfTest { IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - IgniteCache<Object,Object> cache = g.jcache(null). + IgniteCache<Object,Object> cache = g.cache(null). withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000))); long key = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java index 0145559..760eb7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java @@ -96,17 +96,17 @@ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest { try { final String key = "key"; - g.jcache(null).withExpiryPolicy( + g.cache(null).withExpiryPolicy( new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000))).put(key, 1); - assertEquals(1, g.jcache(null).get(key)); + assertEquals(1, g.cache(null).get(key)); U.sleep(1100); GridTestUtils.retryAssert(log, 10, 100, new CAX() { @Override public void applyx() { // Check that no more entries left in the map. - assertNull(g.jcache(null).get(key)); + assertNull(g.cache(null).get(key)); if (!g.internalCache().context().deferredDelete()) assertNull(g.internalCache().map().getEntry(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java index 62455ec..db8d18d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java @@ -121,26 +121,26 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes byte[] val = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0}; for (int i = 0; i < keyCnt; i++) - grid(0).jcache(null).put(String.valueOf(i), val); + grid(0).cache(null).put(String.valueOf(i), val); for (int i = 0; i < keyCnt; i++) - grid(0).jcache(null).get(String.valueOf(i)); + grid(0).cache(null).get(String.valueOf(i)); startGrid(1); if (memMode == ONHEAP_TIERED) { for (int i = 0; i < keyCnt; i++) - grid(0).jcache(null).localEvict(Collections.<Object>singleton(String.valueOf(i))); + grid(0).cache(null).localEvict(Collections.<Object>singleton(String.valueOf(i))); for (int i = 0; i < keyCnt; i++) - grid(0).jcache(null).localPromote(Collections.singleton(String.valueOf(i))); + grid(0).cache(null).localPromote(Collections.singleton(String.valueOf(i))); } startGrid(2); for (int g = 0; g < 3; g++) { for (int i = 0; i < keyCnt; i++) { - byte[] o = (byte[])grid(g).jcache(null).get(String.valueOf(i)); + byte[] o = (byte[])grid(g).cache(null).get(String.valueOf(i)); assertTrue("Got invalid value [val=" + Arrays.toString(val) + ", actual=" + Arrays.toString(o) + ']', Arrays.equals(val, o)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 b4235b0..7877f0b 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 @@ -29,7 +29,6 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -248,7 +247,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach Ignite ignite = grid(g); - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); int k = rnd.nextInt(range); @@ -274,7 +273,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach Long firstVal = null; for (int g = 0; g < gridCount(); g++) { - Long val = (Long)grid(g).jcache(null).localPeek(i, CachePeekMode.ONHEAP); + Long val = (Long)grid(g).cache(null).localPeek(i, CachePeekMode.ONHEAP); if (firstVal == null && val != null) firstVal = val; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 c6563f2..ce0a55c 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() { while (cnt++ < txCnt && !done.get()) { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<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/34046ec8/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 278ef5f..8fb4f68 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 @@ -137,7 +137,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private void checkSingleWrites() throws Exception { prepare(); - IgniteCache<Integer, String> cache = grid(0).jcache(null); + IgniteCache<Integer, String> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) cache.put(i, String.valueOf(i)); @@ -156,7 +156,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC for (int i = 0; i < 100; i++) map.put(i, String.valueOf(i)); - grid(0).jcache(null).putAll(map); + grid(0).cache(null).putAll(map); checkWrites(); } @@ -167,7 +167,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private void checkTxWrites() throws Exception { prepare(); - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { for (int i = 0; i < 100; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java index d7a21ea..aa8e2f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java @@ -314,7 +314,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst * @return Client cache. */ private IgniteCache<Object, Object> clientCache() { - return grid(CLN_GRD).jcache(CACHE_NAME); + return grid(CLN_GRD).cache(CACHE_NAME); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 c9b28ae..371e547 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 @@ -216,7 +216,7 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { * @return Cache. */ protected <K, V> IgniteCache<K, V> jcache(int idx) { - return grid(idx).jcache(null); + return grid(idx).cache(null); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java index 4a0f991..011820f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCopyOnReadDisabledAbstractTest.java @@ -47,7 +47,7 @@ public abstract class IgniteCacheCopyOnReadDisabledAbstractTest extends GridCach * @throws Exception If failed. */ public void testCopyOnReadDisabled() throws Exception { - IgniteCache<TestKey, TestValue> cache = ignite(0).jcache(null); + IgniteCache<TestKey, TestValue> cache = ignite(0).cache(null); for (int i = 0; i < 100; i++) { TestKey key = new TestKey(i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java index 2624432..4542954 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java @@ -120,7 +120,7 @@ public class IgniteCacheDynamicStopSelfTest extends GridCommonAbstractTest { int cnt = 0; - for (Cache.Entry<Object, Object> ignored : ignite(0).jcache(null)) + for (Cache.Entry<Object, Object> ignored : ignite(0).cache(null)) cnt++; info(">>> cnt=" + cnt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/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 c6038ed..a873bb0 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 @@ -299,7 +299,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb Map<Integer, Integer> vals = new HashMap<>(); - for (Integer key : nearKeys(grid.jcache(null), 100, 1_000_000)) + for (Integer key : nearKeys(grid.cache(null), 100, 1_000_000)) vals.put(key, 1); final AtomicBoolean done = new AtomicBoolean(); @@ -460,7 +460,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb try { awaitPartitionMapExchange(); - IgniteCache<Integer, Integer> cache = grid.jcache(null); + IgniteCache<Integer, Integer> cache = grid.cache(null); Integer key = Integer.MAX_VALUE; @@ -484,7 +484,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb try { awaitPartitionMapExchange(); - IgniteCache<Integer, Integer> cache = grid.jcache(null); + IgniteCache<Integer, Integer> cache = grid.cache(null); log.info("Check filter for listener in configuration."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java index cbdbaa4..9019d2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java @@ -100,12 +100,12 @@ public class IgniteCacheStartStopLoadTest extends GridCommonAbstractTest { }, CACHE_COUNT, "cache-starter"); for (String cacheName : CACHE_NAMES) - assert ignite(0).jcache(cacheName) != null; + assert ignite(0).cache(cacheName) != null; if (weakMap == null) { weakMap = new WeakHashMap<>(); - IgniteCache<Object, Object> cache = ignite(0).jcache(CACHE_NAMES[0]); + IgniteCache<Object, Object> cache = ignite(0).cache(CACHE_NAMES[0]); Object obj = new Date(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPreloadNoWriteTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPreloadNoWriteTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPreloadNoWriteTest.java index 95c71f9..87c55b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPreloadNoWriteTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPreloadNoWriteTest.java @@ -30,7 +30,6 @@ import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; import static org.apache.ignite.transactions.TransactionIsolation.*; @@ -81,7 +80,7 @@ public class IgniteCacheTxPreloadNoWriteTest extends GridCommonAbstractTest { CacheAffinity<Integer> aff = ignite0.affinity(null); - IgniteCache<Integer, Object> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Object> cache0 = ignite0.cache(null); for (int i = 0; i < 1000; i++) cache0.put(i + 10000, new byte[1024]); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java index 719a64f..1752368 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java @@ -269,19 +269,19 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { info("Getting cache for node: " + g); - assertNotNull(grid(g).jcache(DYNAMIC_CACHE_NAME)); + assertNotNull(grid(g).cache(DYNAMIC_CACHE_NAME)); } - grid(0).jcache(DYNAMIC_CACHE_NAME).put("1", "1"); + grid(0).cache(DYNAMIC_CACHE_NAME).put("1", "1"); for (int g = 0; g < nodeCount(); g++) - assertEquals("1", grid(g).jcache(DYNAMIC_CACHE_NAME).get("1")); + assertEquals("1", grid(g).cache(DYNAMIC_CACHE_NAME).get("1")); // Grab caches before stop. final IgniteCache[] caches = new IgniteCache[nodeCount()]; for (int g = 0; g < nodeCount(); g++) - caches[g] = grid(g).jcache(DYNAMIC_CACHE_NAME); + caches[g] = grid(g).cache(DYNAMIC_CACHE_NAME); kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME).get(); @@ -296,7 +296,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { - return kernal0.jcache(DYNAMIC_CACHE_NAME); + return kernal0.cache(DYNAMIC_CACHE_NAME); } }, IllegalArgumentException.class, null); @@ -329,12 +329,12 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { try { // Check that cache got deployed on new node. - IgniteCache<Object, Object> cache = ignite(nodeCount()).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> cache = ignite(nodeCount()).cache(DYNAMIC_CACHE_NAME); cache.put("1", "1"); for (int g = 0; g < nodeCount() + 1; g++) { - assertEquals("1", grid(g).jcache(DYNAMIC_CACHE_NAME).get("1")); + assertEquals("1", grid(g).cache(DYNAMIC_CACHE_NAME).get("1")); Collection<ClusterNode> nodes = grid(g).affinity(DYNAMIC_CACHE_NAME).mapKeyToPrimaryAndBackups(0); @@ -356,7 +356,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { - return kernal0.jcache(DYNAMIC_CACHE_NAME); + return kernal0.cache(DYNAMIC_CACHE_NAME); } }, IllegalArgumentException.class, null); } @@ -389,10 +389,10 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { startGrid(nodeCount() + 1); for (int i = 0; i < 100; i++) - grid(0).jcache(DYNAMIC_CACHE_NAME).put(i, i); + grid(0).cache(DYNAMIC_CACHE_NAME).put(i, i); for (int i = 0; i < 100; i++) - assertEquals(i, grid(1).jcache(DYNAMIC_CACHE_NAME).get(i)); + assertEquals(i, grid(1).cache(DYNAMIC_CACHE_NAME).get(i)); info("Affinity nodes: " + grid(0).affinity(DYNAMIC_CACHE_NAME).mapKeyToPrimaryAndBackups(0)); @@ -414,7 +414,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { f.get(); if (g < nodeCount()) - assertNotNull(grid(g).jcache(DYNAMIC_CACHE_NAME)); + assertNotNull(grid(g).cache(DYNAMIC_CACHE_NAME)); else GridTestUtils.assertThrows(log, new Callable<Object>() { @Override @@ -485,12 +485,12 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { }, IllegalArgumentException.class, null); // Should obtain client cache on new node. - IgniteCache<Object, Object> clientCache = ignite(nodeCount()).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> clientCache = ignite(nodeCount()).cache(DYNAMIC_CACHE_NAME); clientCache.put("1", "1"); for (int g = 0; g < nodeCount() + 1; g++) - assertEquals("1", ignite(g).jcache(DYNAMIC_CACHE_NAME).get("1")); + assertEquals("1", ignite(g).cache(DYNAMIC_CACHE_NAME).get("1")); kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME).get(); } finally { @@ -526,12 +526,12 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { assertFalse(cache.context().affinityNode()); // Should obtain client cache on new node. - IgniteCache<Object, Object> clientCache = ignite(nodeCount()).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> clientCache = ignite(nodeCount()).cache(DYNAMIC_CACHE_NAME); clientCache.put("1", "1"); for (int g = 0; g < nodeCount() + 1; g++) - assertEquals("1", ignite(g).jcache(DYNAMIC_CACHE_NAME).get("1")); + assertEquals("1", ignite(g).cache(DYNAMIC_CACHE_NAME).get("1")); kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME).get(); } finally { @@ -571,12 +571,12 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { assertTrue(cache.context().isNear()); // Should obtain client cache on new node. - IgniteCache<Object, Object> clientCache = ignite(nodeCount()).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> clientCache = ignite(nodeCount()).cache(DYNAMIC_CACHE_NAME); clientCache.put("1", "1"); for (int g = 0; g < nodeCount() + 1; g++) - assertEquals("1", ignite(g).jcache(DYNAMIC_CACHE_NAME).get("1")); + assertEquals("1", ignite(g).cache(DYNAMIC_CACHE_NAME).get("1")); kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME).get(); } @@ -882,7 +882,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { int nodes = F.size(G.allGrids()); for (int i = 0; i < nodes; i++) { - IgniteCache<Object, Object> jcache = ignite(i).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> jcache = ignite(i).cache(DYNAMIC_CACHE_NAME); for (int k = 0; k < 20; k++) { int key = i + k * nodes; @@ -892,14 +892,14 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { } for (int i = 0; i < nodes; i++) { - IgniteCache<Object, Object> jcache = ignite(i).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> jcache = ignite(i).cache(DYNAMIC_CACHE_NAME); for (int k = 0; k < 20 * nodes; k++) assertEquals(k, jcache.get(k)); } for (int i = 0; i < nodes; i++) { - IgniteCache<Object, Object> jcache = ignite(i).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> jcache = ignite(i).cache(DYNAMIC_CACHE_NAME); for (int k = 0; k < 20; k++) { int key = i + k * nodes; @@ -909,7 +909,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { } for (int i = 0; i < nodes; i++) { - IgniteCache<Object, Object> jcache = ignite(i).jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Object, Object> jcache = ignite(i).cache(DYNAMIC_CACHE_NAME); for (int k = 0; k < 20 * nodes; k++) assertNull(jcache.get(k)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java index d31c0db..3b3e5e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -74,7 +74,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA try { for (int i = 0; i < GRID_CNT - 1; i++) - grid(i).jcache(null).rebalance().get(); + grid(i).cache(null).rebalance().get(); startGrid(GRID_CNT - 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java index d34f01b..93f51d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java @@ -67,7 +67,7 @@ public class IgniteStaticCacheStartSelfTest extends GridCommonAbstractTest { Ignite ignite = ignite(i); - IgniteCache<Object, Object> jcache = ignite.jcache(CACHE_NAME); + IgniteCache<Object, Object> jcache = ignite.cache(CACHE_NAME); assertNotNull(jcache); @@ -83,7 +83,7 @@ public class IgniteStaticCacheStartSelfTest extends GridCommonAbstractTest { Ignite ignite = ignite(i); - IgniteCache<Object, Object> jcache = ignite.jcache(CACHE_NAME); + IgniteCache<Object, Object> jcache = ignite.cache(CACHE_NAME); assertNotNull(jcache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java index 8240d89..5134481 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java @@ -95,7 +95,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra final Ignite ignite = grid(); - ignite.jcache(null).put(key, "val"); + ignite.cache(null).put(key, "val"); GridCacheEntryEx dhtEntry = dht(ignite).peekEx(key); @@ -129,7 +129,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra info("DHT entry [hash=" + System.identityHashCode(dhtEntry) + ", xid=" + tx.xid() + ", entry=" + dhtEntry + ']'); - String val = ignite.<String, String>jcache(null).get(key); + String val = ignite.<String, String>cache(null).get(key); assertNotNull(val); assertEquals("val", val);
