http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index 0754a29..e7f0c3f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -142,7 +142,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest final String initVal = "initialValue"; for (Integer key : keys) { - grid(originatingNode()).jcache(null).put(key, initVal); + grid(originatingNode()).cache(null).put(key, initVal); map.put(key, String.valueOf(key)); } @@ -173,7 +173,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - IgniteCache<Integer, String> cache = originatingNodeGrid.jcache(null); + IgniteCache<Integer, String> cache = originatingNodeGrid.cache(null); assertNotNull(cache); @@ -249,7 +249,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest private Ignite ignite; @Override public Void call() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); @@ -264,7 +264,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest for (Map.Entry<Integer, String> e : map.entrySet()) { for (Ignite g : G.allGrids()) - assertEquals(fullFailure ? initVal : e.getValue(), g.jcache(null).get(e.getKey())); + assertEquals(fullFailure ? initVal : e.getValue(), g.cache(null).get(e.getKey())); } } @@ -296,14 +296,14 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest final String initVal = "initialValue"; for (Integer key : keys) { - grid(originatingNode()).jcache(null).put(key, initVal); + grid(originatingNode()).cache(null).put(key, initVal); map.put(key, String.valueOf(key)); } Map<Integer, Collection<ClusterNode>> nodeMap = new HashMap<>(); - IgniteCache<Integer, String> cache = grid(0).jcache(null); + IgniteCache<Integer, String> cache = grid(0).cache(null); info("Failing node ID: " + grid(1).localNode().id()); @@ -395,7 +395,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest private Ignite ignite; @Override public Void call() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); @@ -410,7 +410,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest for (Map.Entry<Integer, String> e : map.entrySet()) { for (Ignite g : G.allGrids()) - assertEquals(!commmit ? initVal : e.getValue(), g.jcache(null).get(e.getKey())); + assertEquals(!commmit ? initVal : e.getValue(), g.cache(null).get(e.getKey())); } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index 0e139cb..6c56925 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -74,7 +74,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { * @return Cache. */ @Override protected <K, V> IgniteCache<K, V> jcache(int i) { - return IGNITEs.get(i).jcache(null); + return IGNITEs.get(i).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/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java index 56077ca..4338fa5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java @@ -18,14 +18,12 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.spi.swapspace.file.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.junit.Assert.*; /** @@ -104,9 +102,9 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex cachesAtomicOffheapTiered = new IgniteCache[gridCnt]; for (int i = 0; i < gridCount(); i++) { - cachesAtomic[i] = ignites[i].jcache(CACHE_ATOMIC); - cachesAtomicOffheap[i] = ignites[i].jcache(CACHE_ATOMIC_OFFHEAP); - cachesAtomicOffheapTiered[i] = ignites[i].jcache(CACHE_ATOMIC_OFFHEAP_TIERED); + cachesAtomic[i] = ignites[i].cache(CACHE_ATOMIC); + cachesAtomicOffheap[i] = ignites[i].cache(CACHE_ATOMIC_OFFHEAP); + cachesAtomicOffheapTiered[i] = ignites[i].cache(CACHE_ATOMIC_OFFHEAP_TIERED); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index 92603ae..ae49338 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@ -160,7 +160,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = ignite0.affinity(null); @@ -223,7 +223,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - IgniteCache<Integer, Integer> cache = grid(i).jcache(null); + IgniteCache<Integer, Integer> cache = grid(i).cache(null); for (Integer key : nearKeys.keySet()) nearKeys.put(key, val); @@ -262,7 +262,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Object> aff = ignite0.affinity(null); @@ -309,7 +309,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - IgniteCache<Integer, Integer> cache = grid(i).jcache(null); + IgniteCache<Integer, Integer> cache = grid(i).cache(null); log.info("Transform [grid=" + grid(i).name() + ", val=" + val + ']'); @@ -339,7 +339,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Object> aff = ignite0.affinity(null); @@ -402,7 +402,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - IgniteCache<Integer, Integer> cache = grid(i).jcache(null); + IgniteCache<Integer, Integer> cache = grid(i).cache(null); for (Integer key : nearKeys) nearKeys.add(key); @@ -438,21 +438,21 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private void checkPutRemoveGet() throws Exception { Ignite ignite0 = grid(0); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); Integer key = key(ignite0, NOT_PRIMARY_AND_BACKUP); cache0.put(key, key); for (int i = 0; i < GRID_CNT; i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); cache0.remove(key); cache0.put(key, key); for (int i = 0; i < GRID_CNT; i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); cache0.remove(key); } @@ -476,7 +476,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(grid); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = ignite0.affinity(null); @@ -523,7 +523,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - IgniteCache<Integer, Integer> cache = grid(i).jcache(null); + IgniteCache<Integer, Integer> cache = grid(i).cache(null); log.info("Put [grid=" + grid(i).name() + ", val=" + val + ']'); @@ -553,7 +553,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); Integer primaryKey = key(ignite0, PRIMARY); @@ -599,7 +599,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = ignite0.affinity(null); @@ -624,7 +624,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { } IgniteCache<Integer, Integer> primaryCache = G.ignite( - (String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).jcache(null); + (String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null); delay(); @@ -649,7 +649,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private void checkReaderRemove() throws Exception { Ignite ignite0 = grid(0); - IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); + IgniteCache<Integer, Integer> cache0 = ignite0.cache(null); CacheAffinity<Integer> aff = ignite0.affinity(null); @@ -674,7 +674,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { delay(); - IgniteCache<Integer, Integer> primaryCache = primaryNode.jcache(null); + IgniteCache<Integer, Integer> primaryCache = primaryNode.cache(null); primaryCache.put(nearKey, 2); // Put from primary, check there are no readers. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index f45feae..9f92b24 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; -import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -368,7 +367,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { final CountDownLatch lockLatch = new CountDownLatch(1); final CountDownLatch unlockLatch = new CountDownLatch(1); - final Lock lock = g0.jcache(null).lock(key); + final Lock lock = g0.cache(null).lock(key); IgniteInternalFuture<?> unlockFut = multithreadedAsync(new Runnable() { @Override public void run() { @@ -393,13 +392,13 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { U.await(lockLatch); - assert g0.jcache(null).isLocalLocked(key, false); - assert !g0.jcache(null).isLocalLocked(key, true) : "Key can not be locked by current thread."; + assert g0.cache(null).isLocalLocked(key, false); + assert !g0.cache(null).isLocalLocked(key, true) : "Key can not be locked by current thread."; assert !lock.tryLock(); - assert g0.jcache(null).isLocalLocked(key, false); - assert !g0.jcache(null).isLocalLocked(key, true) : "Key can not be locked by current thread."; + assert g0.cache(null).isLocalLocked(key, false); + assert !g0.cache(null).isLocalLocked(key, true) : "Key can not be locked by current thread."; unlockLatch.countDown(); unlockFut.get(); @@ -425,11 +424,11 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { try { for (int i = 0; i < 100; i++) - g0.jcache(null).put(i, i); + g0.cache(null).put(i, i); for (int i = 0; i < 100; i++) { try (Transaction tx = g0.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - Integer val = (Integer) g0.jcache(null).get(i); + Integer val = (Integer) g0.cache(null).get(i); assertEquals((Integer) i, val); } @@ -548,12 +547,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { try { if (separate) { - g0.jcache(null).put(k0, "val" + k0); - g0.jcache(null).put(k1, "val" + k1); - g0.jcache(null).put(k2, "val" + k2); + g0.cache(null).put(k0, "val" + k0); + g0.cache(null).put(k1, "val" + k1); + g0.cache(null).put(k2, "val" + k2); } else - g0.jcache(null).putAll(map); + g0.cache(null).putAll(map); if (tx != null) tx.commit(); @@ -564,12 +563,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { } if (separate) { - assertEquals("val" + k0, g0.jcache(null).get(k0)); - assertEquals("val" + k1, g0.jcache(null).get(k1)); - assertEquals("val" + k2, g0.jcache(null).get(k2)); + assertEquals("val" + k0, g0.cache(null).get(k0)); + assertEquals("val" + k1, g0.cache(null).get(k1)); + assertEquals("val" + k2, g0.cache(null).get(k2)); } else { - Map<Object, Object> res = g0.jcache(null).getAll(map.keySet()); + Map<Object, Object> res = g0.cache(null).getAll(map.keySet()); assertEquals(map, res); } @@ -578,12 +577,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { try { if (separate) { - g0.jcache(null).remove(k0); - g0.jcache(null).remove(k1); - g0.jcache(null).remove(k2); + g0.cache(null).remove(k0); + g0.cache(null).remove(k1); + g0.cache(null).remove(k2); } else - g0.jcache(null).removeAll(map.keySet()); + g0.cache(null).removeAll(map.keySet()); if (tx != null) tx.commit(); @@ -594,12 +593,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { } if (separate) { - assertEquals(null, g0.jcache(null).get(k0)); - assertEquals(null, g0.jcache(null).get(k1)); - assertEquals(null, g0.jcache(null).get(k2)); + assertEquals(null, g0.cache(null).get(k0)); + assertEquals(null, g0.cache(null).get(k1)); + assertEquals(null, g0.cache(null).get(k2)); } else { - Map<Object, Object> res = g0.jcache(null).getAll(map.keySet()); + Map<Object, Object> res = g0.cache(null).getAll(map.keySet()); assertTrue(res.isEmpty()); } @@ -637,11 +636,11 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { try { if (separate) { - g0.jcache(null).put(k1, "val" + k1); - g0.jcache(null).put(k2, "val" + k2); + g0.cache(null).put(k1, "val" + k1); + g0.cache(null).put(k2, "val" + k2); } else - g0.jcache(null).putAll(map); + g0.cache(null).putAll(map); if (tx != null) tx.commit(); @@ -652,11 +651,11 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { } if (separate) { - assertEquals("val" + k1, g0.jcache(null).get(k1)); - assertEquals("val" + k2, g0.jcache(null).get(k2)); + assertEquals("val" + k1, g0.cache(null).get(k1)); + assertEquals("val" + k2, g0.cache(null).get(k2)); } else { - Map<Object, Object> res = g0.jcache(null).getAll(map.keySet()); + Map<Object, Object> res = g0.cache(null).getAll(map.keySet()); assertEquals(map, res); } @@ -665,11 +664,11 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { try { if (separate) { - g0.jcache(null).remove(k1); - g0.jcache(null).remove(k2); + g0.cache(null).remove(k1); + g0.cache(null).remove(k2); } else - g0.jcache(null).removeAll(map.keySet()); + g0.cache(null).removeAll(map.keySet()); if (tx != null) tx.commit(); @@ -680,11 +679,11 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { } if (separate) { - assertEquals(null, g0.jcache(null).get(k1)); - assertEquals(null, g0.jcache(null).get(k2)); + assertEquals(null, g0.cache(null).get(k1)); + assertEquals(null, g0.cache(null).get(k2)); } else { - Map<Object, Object> res = g0.jcache(null).getAll(map.keySet()); + Map<Object, Object> res = g0.cache(null).getAll(map.keySet()); assertTrue(res.isEmpty()); } @@ -738,7 +737,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { Ignite g1 = grid(1); Ignite g2 = grid(2); - g0.jcache(null).putAll(map); + g0.cache(null).putAll(map); checkStore(g0, map); checkStore(g1, Collections.<Integer, String>emptyMap()); @@ -747,7 +746,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { clearStores(3); try (Transaction tx = g0.transactions().txStart(OPTIMISTIC, READ_COMMITTED)) { - g0.jcache(null).putAll(map); + g0.cache(null).putAll(map); tx.commit(); @@ -815,7 +814,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { Map<Integer, String> map0 = F.asMap(k0, "val" + k0, k1, "val" + k1, k2, "val" + k2); - g0.jcache(null).putAll(map0); + g0.cache(null).putAll(map0); Map<Integer, String> map = F.asMap(k0, "value" + k0, k1, "value" + k1, k2, "value" + k2); @@ -823,12 +822,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { try { if (separate) { - g0.jcache(null).put(k0, "value" + k0); - g0.jcache(null).put(k1, "value" + k1); - g0.jcache(null).put(k2, "value" + k2); + g0.cache(null).put(k0, "value" + k0); + g0.cache(null).put(k1, "value" + k1); + g0.cache(null).put(k2, "value" + k2); } else - g0.jcache(null).putAll(map); + g0.cache(null).putAll(map); tx.rollback(); } @@ -837,12 +836,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { } if (separate) { - assertEquals("val" + k0, g0.jcache(null).get(k0)); - assertEquals("val" + k1, g0.jcache(null).get(k1)); - assertEquals("val" + k2, g0.jcache(null).get(k2)); + assertEquals("val" + k0, g0.cache(null).get(k0)); + assertEquals("val" + k1, g0.cache(null).get(k1)); + assertEquals("val" + k2, g0.cache(null).get(k2)); } else { - Map<Object, Object> res = g0.jcache(null).getAll(map.keySet()); + Map<Object, Object> res = g0.cache(null).getAll(map.keySet()); assertEquals(map0, res); } @@ -851,12 +850,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { try { if (separate) { - g0.jcache(null).remove(k0); - g0.jcache(null).remove(k1); - g0.jcache(null).remove(k2); + g0.cache(null).remove(k0); + g0.cache(null).remove(k1); + g0.cache(null).remove(k2); } else - g0.jcache(null).removeAll(map.keySet()); + g0.cache(null).removeAll(map.keySet()); tx.rollback(); } @@ -865,12 +864,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { } if (separate) { - assertEquals("val" + k0, g0.jcache(null).get(k0)); - assertEquals("val" + k1, g0.jcache(null).get(k1)); - assertEquals("val" + k2, g0.jcache(null).get(k2)); + assertEquals("val" + k0, g0.cache(null).get(k0)); + assertEquals("val" + k1, g0.cache(null).get(k1)); + assertEquals("val" + k2, g0.cache(null).get(k2)); } else { - Map<Object, Object> res = g0.jcache(null).getAll(map.keySet()); + Map<Object, Object> res = g0.cache(null).getAll(map.keySet()); assertEquals(map0, res); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index de57399..308637e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -95,7 +95,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA for (int i = 0; i < GRID_CNT; i++) { ignites[i] = startGrid(i); - caches[i] = ignites[i].jcache(CACHE); + caches[i] = ignites[i].cache(CACHE); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java index 249eac9..5dd10b8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java @@ -36,7 +36,6 @@ import org.apache.ignite.transactions.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -121,7 +120,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { * @return Near cache. */ private IgniteCache<Integer, String> near(Ignite g) { - return g.jcache(null); + return g.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/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index 9593e89..be4cef7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -270,7 +270,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT // Evict on primary node. // It will trigger dht eviction and eviction on backup node. - grid(primary).jcache(null).localEvict(Collections.<Object>singleton(key)); + grid(primary).cache(null).localEvict(Collections.<Object>singleton(key)); futOther.get(3000); futBackup.get(3000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java index e3f0bca..a177e00 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java @@ -241,7 +241,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { // Evict on primary node. // It should trigger dht eviction and eviction on backup node. - grid(primary).jcache(null).localEvict(Collections.<Object>singleton(key)); + grid(primary).cache(null).localEvict(Collections.<Object>singleton(key)); // Give 5 seconds for eviction event to occur on backup and primary node. futBackup.get(3000); @@ -317,7 +317,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { // Evict on primary node. // Eviction of the last key should trigger queue processing. for (Integer key : keys) - primaryIgnite.jcache(null).localEvict(Collections.<Object>singleton(key)); + primaryIgnite.cache(null).localEvict(Collections.<Object>singleton(key)); // Give 5 seconds for eviction events to occur on backup and primary node. futBackup.get(3000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java index a2996e0..f4d0cb2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java @@ -99,7 +99,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ private void checkNodes(Ignite g) throws Exception { - IgniteCache<String, String> cache = g.jcache("test"); + IgniteCache<String, String> cache = g.cache("test"); for (char c = 'a'; c <= 'z'; c++) { String key = Character.toString(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java index f25e2d9..b944869 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java @@ -98,20 +98,20 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { ClusterNode other = nodes.get2(); // Create on non-primary node. - grid(other).jcache(null).put(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), 1); + grid(other).cache(null).put(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), 1); check(primary, other, true); // Update on primary. - grid(primary).jcache(null).put(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), 2); + grid(primary).cache(null).put(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), 2); // Check on non-primary. - assertEquals(2, grid(other).jcache(null).get(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME))); + assertEquals(2, grid(other).cache(null).get(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME))); check(primary, other, true); // Remove. - assert grid(other).jcache(null).remove(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME)); + assert grid(other).cache(null).remove(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME)); check(primary, other, false); } @@ -146,7 +146,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { * @return Atomic long value. */ private Object peekGlobal(ClusterNode node) { - return grid(node).jcache(null).localPeek(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), CachePeekMode.ONHEAP); + return grid(node).cache(null).localPeek(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), CachePeekMode.ONHEAP); } /** @@ -154,7 +154,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { * @return Atomic long value. */ private Object peekNear(ClusterNode node) { - return grid(node).jcache(null).localPeek(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), CachePeekMode.NEAR); + return grid(node).cache(null).localPeek(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), CachePeekMode.NEAR); } /** @@ -162,7 +162,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { * @return Atomic long value. */ private Object peekDht(ClusterNode node) { - return grid(node).jcache(null).localPeek(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), CachePeekMode.BACKUP, + return grid(node).cache(null).localPeek(new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME), CachePeekMode.BACKUP, CachePeekMode.PRIMARY); } @@ -171,7 +171,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { * @return DHT entry. */ private GridDhtCacheEntry peekDhtEntry(ClusterNode node) { - return (GridDhtCacheEntry)dht(grid(node).jcache(null)).peekEx( + return (GridDhtCacheEntry)dht(grid(node).cache(null)).peekEx( new GridCacheInternalKeyImpl(ATOMIC_LONG_NAME)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java index 05b8138..682a321 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java @@ -28,7 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; 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.cache.CacheRebalanceMode.*; @@ -77,7 +76,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest { startGridsMultiThreaded(nodeCnt); - IgniteCache<Integer, Integer> cache = grid(nodeCnt - 1).jcache(null); + IgniteCache<Integer, Integer> cache = grid(nodeCnt - 1).cache(null); int kv = 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java index e40b670..105a4c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java @@ -54,14 +54,14 @@ public class GridCacheDhtMultiBackupTest extends GridCommonAbstractTest { @Override public void applyx() { X.println("Checking whether cache is empty."); - IgniteCache<SampleKey, SampleValue> cache = g.jcache("partitioned"); + IgniteCache<SampleKey, SampleValue> cache = g.cache("partitioned"); assert cache.localSize() == 0; } } ); - IgniteCache<SampleKey, SampleValue> cache = g.jcache("partitioned"); + IgniteCache<SampleKey, SampleValue> cache = g.cache("partitioned"); int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java index 2d4aac7..547ba06 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java @@ -128,7 +128,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { int cnt = 10000; - populate(grid(0).<Integer, byte[]>jcache(null), cnt, KBSIZE); + populate(grid(0).<Integer, byte[]>cache(null), cnt, KBSIZE); int gridCnt = 3; @@ -138,7 +138,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { Thread.sleep(10000); for (int i = 0; i < gridCnt; i++) { - IgniteCache<Integer, String> c = grid(i).jcache(null); + IgniteCache<Integer, String> c = grid(i).cache(null); if (backups + 1 <= gridCnt) assert c.localSize() < cnt : "Cache size: " + c.localSize(); @@ -167,7 +167,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { @Override public void onLifecycleEvent(LifecycleEventType evt) { if (evt == LifecycleEventType.AFTER_NODE_START) { - IgniteCache<Integer, byte[]> c = ignite.jcache(null); + IgniteCache<Integer, byte[]> c = ignite.cache(null); if (c.putIfAbsent(-1, new byte[1])) { populate(c, cnt, KBSIZE); @@ -184,12 +184,12 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { startGrid(i); for (int i = 0; i < gridCnt; i++) - info("Grid size [i=" + i + ", size=" + grid(i).jcache(null).size() + ']'); + info("Grid size [i=" + i + ", size=" + grid(i).cache(null).size() + ']'); Thread.sleep(10000); for (int i = 0; i < gridCnt; i++) { - IgniteCache<Integer, String> c = grid(i).jcache(null); + IgniteCache<Integer, String> c = grid(i).cache(null); if (backups + 1 <= gridCnt) assert c.localSize() < cnt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 5a9e074..e3e878f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -40,7 +40,6 @@ import java.util.*; import java.util.concurrent.*; 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.cache.CacheRebalanceMode.*; @@ -103,7 +102,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - IgniteCache<String, Integer> c0 = g0.jcache(null); + IgniteCache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -111,8 +110,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - IgniteCache<String, Integer> c1 = g1.jcache(null); - IgniteCache<String, Integer> c2 = g2.jcache(null); + IgniteCache<String, Integer> c1 = g1.cache(null); + IgniteCache<String, Integer> c2 = g2.cache(null); for (int i = 0; i < cnt; i++) assertNull(c1.localPeek(Integer.toString(i), CachePeekMode.ONHEAP)); @@ -180,7 +179,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - IgniteCache<String, Integer> c0 = g0.jcache(null); + IgniteCache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -188,8 +187,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - IgniteCache<String, Integer> c1 = g1.jcache(null); - IgniteCache<String, Integer> c2 = g2.jcache(null); + IgniteCache<String, Integer> c1 = g1.cache(null); + IgniteCache<String, Integer> c2 = g2.cache(null); for (int i = 0; i < cnt; i++) assertNull(c1.localPeek(Integer.toString(i), CachePeekMode.ONHEAP)); @@ -250,7 +249,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - IgniteCache<String, Integer> c0 = g0.jcache(null); + IgniteCache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -258,8 +257,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - IgniteCache<String, Integer> c1 = g1.jcache(null); - IgniteCache<String, Integer> c2 = g2.jcache(null); + IgniteCache<String, Integer> c1 = g1.cache(null); + IgniteCache<String, Integer> c2 = g2.cache(null); GridDhtCacheAdapter<String, Integer> d0 = dht(0); GridDhtCacheAdapter<String, Integer> d1 = dht(1); @@ -351,7 +350,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { long start = System.currentTimeMillis(); - g.jcache(null).rebalance().get(); + g.cache(null).rebalance().get(); info(">>> Finished preloading of empty cache in " + (System.currentTimeMillis() - start) + "ms."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java index 98a2010..3b28045 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java @@ -115,7 +115,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest * @return Topology. */ private GridDhtPartitionTopology topology(int i) { - return near(grid(i).jcache(null)).dht().topology(); + return near(grid(i).cache(null)).dht().topology(); } /** @throws Exception If failed. */ @@ -172,7 +172,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest try { Ignite ignite1 = startGrid(0); - IgniteCache<Integer, String> cache1 = ignite1.jcache(null); + IgniteCache<Integer, String> cache1 = ignite1.cache(null); int keyCnt = 10; @@ -193,7 +193,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite g : ignites) { - IgniteCache<Integer, String> c = g.jcache(null); + IgniteCache<Integer, String> c = g.cache(null); for (int i = 0; i < keyCnt; i++) assertNull(c.localPeek(i, CachePeekMode.ONHEAP)); @@ -217,7 +217,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite gg : ignites) { - IgniteCache<Integer, String> c = gg.jcache(null); + IgniteCache<Integer, String> c = gg.cache(null); for (int i = 0; i < keyCnt; i++) assertNull(c.localPeek(i, CachePeekMode.ONHEAP)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java index 6120935..5addf2d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java @@ -92,7 +92,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest int cnt = KEY_CNT; - IgniteCache<String, Integer> c0 = g0.jcache(null); + IgniteCache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -102,8 +102,8 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest U.sleep(1000); - IgniteCache<String, Integer> c1 = g1.jcache(null); - IgniteCache<String, Integer> c2 = g2.jcache(null); + IgniteCache<String, Integer> c1 = g1.cache(null); + IgniteCache<String, Integer> c2 = g2.cache(null); TestCommunicationSpi spi0 = (TestCommunicationSpi)g0.configuration().getCommunicationSpi(); TestCommunicationSpi spi1 = (TestCommunicationSpi)g1.configuration().getCommunicationSpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java index 287245d..8a93678 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java @@ -191,7 +191,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < ITER_CNT; i++) { info("Iteration # " + i); - IgniteCache<Integer, Integer> cache = g2.jcache(null); + IgniteCache<Integer, Integer> cache = g2.cache(null); for (int j = 0; j < KEY_CNT; j++) { Integer val = cache.get(j); @@ -223,7 +223,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); - IgniteCache<Integer, Integer> cache = g1.jcache(null); + IgniteCache<Integer, Integer> cache = g1.cache(null); for (int j = 0; j < KEY_CNT; j++) { cache.put(j, j); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 2e4d42b..647ff05 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -215,7 +215,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { try { Ignite ignite1 = startGrid(0); - IgniteCache<Integer, String> cache1 = ignite1.jcache(null); + IgniteCache<Integer, String> cache1 = ignite1.cache(null); putKeys(cache1, keyCnt); checkKeys(cache1, keyCnt, F.asList(ignite1)); @@ -226,7 +226,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all nodes. for (Ignite g : ignites) { - IgniteCache<Integer, String> c = g.jcache(null); + IgniteCache<Integer, String> c = g.cache(null); checkKeys(c, keyCnt, ignites); } @@ -301,7 +301,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { assert last != null; - IgniteCache<Integer, String> lastCache = last.jcache(null); + IgniteCache<Integer, String> lastCache = last.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(lastCache); @@ -342,7 +342,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { private void checkActiveState(Iterable<Ignite> grids) { // Check that nodes don't have non-active information about other nodes. for (Ignite g : grids) { - IgniteCache<Integer, String> c = g.jcache(null); + IgniteCache<Integer, String> c = g.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(c); @@ -485,7 +485,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { try { Ignite ignite1 = startGrid(0); - IgniteCache<Integer, String> cache1 = ignite1.jcache(null); + IgniteCache<Integer, String> cache1 = ignite1.cache(null); putKeys(cache1, keyCnt); checkKeys(cache1, keyCnt, F.asList(ignite1)); @@ -496,7 +496,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all nodes. for (Ignite g : ignites) { - IgniteCache<Integer, String> c = g.jcache(null); + IgniteCache<Integer, String> c = g.cache(null); checkKeys(c, keyCnt, ignites); } @@ -559,7 +559,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all left nodes. for (Ignite gg : ignites) { - IgniteCache<Integer, String> c = gg.jcache(null); + IgniteCache<Integer, String> c = gg.cache(null); checkKeys(c, keyCnt, ignites); } @@ -567,7 +567,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { assert last != null; - IgniteCache<Integer, String> lastCache = last.jcache(null); + IgniteCache<Integer, String> lastCache = last.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(lastCache); @@ -654,7 +654,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { Map<String, String> map = new HashMap<>(); for (Ignite g : grids) { - IgniteCache<Integer, String> c = g.jcache(null); + IgniteCache<Integer, String> c = g.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java index ad45ce8..6d3ba30 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java @@ -179,7 +179,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest try { Ignite g1 = startGrid(0); - IgniteCache<Integer, String> c1 = g1.jcache(null); + IgniteCache<Integer, String> c1 = g1.cache(null); putKeys(c1, keyCnt); checkKeys(c1, keyCnt); @@ -190,7 +190,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite g : ignites) { - IgniteCache<Integer, String> c = g.jcache(null); + IgniteCache<Integer, String> c = g.cache(null); checkKeys(c, keyCnt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java index 072aa03..07c6ab8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java @@ -125,7 +125,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { int cnt = 1000; - populate(grid(0).<Integer, String>jcache(null), cnt); + populate(grid(0).<Integer, String>cache(null), cnt); int gridCnt = 2; @@ -152,7 +152,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { int cnt = 1000; - populate(grid(0).<Integer, String>jcache(null), cnt); + populate(grid(0).<Integer, String>cache(null), cnt); int gridCnt = 2; @@ -167,10 +167,10 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { Thread.sleep(wait); for (int i = 0; i < gridCnt; i++) - info("Grid size [i=" + i + ", size=" + grid(i).jcache(null).localSize() + ']'); + info("Grid size [i=" + i + ", size=" + grid(i).cache(null).localSize() + ']'); for (int i = 0; i < gridCnt; i++) { - IgniteCache<Integer, String> c = grid(i).jcache(null); + IgniteCache<Integer, String> c = grid(i).cache(null); // Nothing should be unloaded since nodes are backing up each other. assertEquals(cnt, c.localSize()); @@ -197,7 +197,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { boolean err = false; for (int i = 0; i < gridCnt; i++) { - IgniteCache<Integer, String> c = grid(i).jcache(null); + IgniteCache<Integer, String> c = grid(i).cache(null); if (c.localSize() >= cnt) err = true; @@ -210,10 +210,10 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { } for (int i = 0; i < gridCnt; i++) - info("Grid size [i=" + i + ", size=" + grid(i).jcache(null).localSize() + ']'); + info("Grid size [i=" + i + ", size=" + grid(i).cache(null).localSize() + ']'); for (int i = 0; i < gridCnt; i++) { - IgniteCache<Integer, String> c = grid(i).jcache(null); + IgniteCache<Integer, String> c = grid(i).cache(null); assert c.localSize() < cnt; } @@ -231,7 +231,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { int cnt = 1000; - populate(grid(0).<Integer, String>jcache(null), cnt); + populate(grid(0).<Integer, String>cache(null), cnt); int gridCnt = 3; @@ -239,7 +239,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { startGrid(i); for (int j = 0; j <= i; j++) - info("Grid size [i=" + i + ", size=" + grid(j).jcache(null).localSize() + ']'); + info("Grid size [i=" + i + ", size=" + grid(j).cache(null).localSize() + ']'); } long wait = 3000; @@ -265,10 +265,10 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { @Override public void onLifecycleEvent(LifecycleEventType evt) { if (evt == LifecycleEventType.AFTER_NODE_START) { - IgniteCache<Integer, String> c = ignite.jcache(null); + IgniteCache<Integer, String> c = ignite.cache(null); if (c.putIfAbsent(-1, "true")) { - populate(ignite.<Integer, String>jcache(null), cnt); + populate(ignite.<Integer, String>cache(null), cnt); info(">>> POPULATED GRID <<<"); } @@ -282,7 +282,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { startGrid(i); for (int j = 0; j < i; j++) - info("Grid size [i=" + i + ", size=" + grid(j).jcache(null).localSize() + ']'); + info("Grid size [i=" + i + ", size=" + grid(j).cache(null).localSize() + ']'); } long wait = 3000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java index 372976d..17bbead 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java @@ -76,7 +76,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb * @throws Exception If failed. */ public void _testGettingRemovedKey() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(0, 0); @@ -84,14 +84,14 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb Ignite g = grid(i); // TODO: getting of removed key will produce 3 inner read operations. - g.jcache(null).removeAll(); + g.cache(null).removeAll(); // TODO: getting of removed key will produce inner write and 4 inner read operations. //((IgniteKernal)g).cache(null).remove(0); - assert g.jcache(null).localSize() == 0; + assert g.cache(null).localSize() == 0; - g.jcache(null).mxBean().clear(); + g.cache(null).mxBean().clear(); } assertNull("Value is not null for key: " + 0, cache.get(0)); @@ -103,7 +103,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb long misses = 0; for (int i = 0; i < gridCount(); i++) { - CacheMetrics m = grid(i).jcache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); removes += m.getCacheRemovals(); reads += m.getCacheGets(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java index 75f5f07..5866ed7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java @@ -99,7 +99,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE Collection<Integer> keys = new HashSet<>(); - IgniteCache<Integer, String> cache = g1.jcache(null); + IgniteCache<Integer, String> cache = g1.cache(null); for (int i = 0; i < 100; i++) { keys.add(i); @@ -116,7 +116,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE for (Object key : g2Keys) // Need to force keys loading. - assertEquals("val", g2.jcache(null).getAndPut(key, "changed val")); + assertEquals("val", g2.cache(null).getAndPut(key, "changed val")); Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index f41d7f2..11d8ba0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -149,7 +149,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra futs.add(multithreadedAsync(new Runnable() { @Override public void run() { try { - Lock lock = node.jcache(null).lock(key); + Lock lock = node.cache(null).lock(key); lock.lock(); @@ -161,7 +161,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra info(">>> Acquiring explicit lock for key: " + key * 10); - Lock lock10 = node.jcache(null).lock(key * 10); + Lock lock10 = node.cache(null).lock(key * 10); lock10.lock(); @@ -257,7 +257,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Integer key : keysMap.values()) { futs.add(multithreadedAsync(new Runnable() { @Override public void run() { - IgniteCache<Integer, Integer> cache = node.jcache(null); + IgniteCache<Integer, Integer> cache = node.cache(null); try { try (Transaction tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { @@ -326,7 +326,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @Override public void run() { - IgniteCache<Integer, Integer> cache = g.jcache(null); + IgniteCache<Integer, Integer> cache = g.cache(null); int key = (int)Thread.currentThread().getId(); @@ -411,7 +411,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Integer key : keysMap.values()) { futs.add(multithreadedAsync(new Runnable() { @Override public void run() { - IgniteCache<Integer, Integer> cache = node.jcache(null); + IgniteCache<Integer, Integer> cache = node.cache(null); try { try (Transaction tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { @@ -462,7 +462,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @Override public void run() { - IgniteCache<Integer, Integer> cache = g.jcache(null); + IgniteCache<Integer, Integer> cache = g.cache(null); int key = (int)Thread.currentThread().getId(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java index 4091145..121d72c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java @@ -74,7 +74,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract Collection<Integer> allKeys = new ArrayList<>(100); - IgniteCache<Integer, String> cache = g1.jcache(null); + IgniteCache<Integer, String> cache = g1.cache(null); for (int i = 0; i < 100; i++) { cache.put(i, "val"); @@ -99,7 +99,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract Collection <Event> partEvts = g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_PART_UNLOADED); - checkPartitionUnloadEvents(partEvts, g1, dht(g2.jcache(null)).topology().localPartitions()); + checkPartitionUnloadEvents(partEvts, g1, dht(g2.cache(null)).topology().localPartitions()); } /** @@ -114,7 +114,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract CacheEvent cacheEvt = ((CacheEvent)evt); assertEquals(EVT_CACHE_REBALANCE_OBJECT_UNLOADED, cacheEvt.type()); - assertEquals(g.jcache(null).getName(), cacheEvt.cacheName()); + assertEquals(g.cache(null).getName(), cacheEvt.cacheName()); assertEquals(g.cluster().localNode().id(), cacheEvt.node().id()); assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id()); assertTrue("Unexpected key: " + cacheEvt.key(), keys.contains(cacheEvt.key())); @@ -143,7 +143,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract } })); - assertEquals(g.jcache(null).getName(), unloadEvt.cacheName()); + assertEquals(g.cache(null).getName(), unloadEvt.cacheName()); assertEquals(g.cluster().localNode().id(), unloadEvt.node().id()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java index 8b49c10..0e8e8c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java @@ -44,7 +44,7 @@ public class IgniteTxReentryColocatedSelfTest extends IgniteTxReentryAbstractSel @Override protected int testKey() { int key = 0; - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); while (true) { Collection<ClusterNode> nodes = affinity(cache).mapKeyToPrimaryAndBackups(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index c066770..d23e1d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -157,7 +157,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA startGrids(gridCnt); try { - final IgniteCache<Object, Object> cache = grid(0).jcache(null); + final IgniteCache<Object, Object> cache = grid(0).cache(null); final int range = 100_000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java index 1b7ebda..cf4a736 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java @@ -96,7 +96,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { awaitPartitionMapExchange(); - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); List<Integer> keys = generateKeys(grid(0).localNode(), cache); @@ -165,7 +165,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { ClusterNode node = grid.localNode(); - IgniteCache<Object, Object> cache = grid.jcache(null); + IgniteCache<Object, Object> cache = grid.cache(null); boolean primary = grid.affinity(null).isPrimary(node, key); boolean backup = grid.affinity(null).isBackup(node, key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java index d2540bc..f5d09a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java @@ -72,7 +72,7 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi for (int i = rangeStart; i < rangeStart + range; i++) { int idx = ThreadLocalRandom8.current().nextInt(gridCount()); - IgniteCache<Integer, Integer> cache = grid(idx).jcache(null); + IgniteCache<Integer, Integer> cache = grid(idx).cache(null); cache = ((IgniteCacheProxy<Integer, Integer>)cache).flagOn(FORCE_TRANSFORM_BACKUP); @@ -92,7 +92,7 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi int total = 0; for (int idx = 0; idx < gridCount(); idx++) { - IgniteCache<Integer, Integer> cache = grid(idx).jcache(null); + IgniteCache<Integer, Integer> cache = grid(idx).cache(null); for (int i = 0; i < keyCnt; i++) { Integer val = cache.localPeek(i, CachePeekMode.ONHEAP); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 44fd803..f308814 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -187,7 +187,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache long ttl = 500; - grid(0).jcache(null). + grid(0).cache(null). withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl))).put(key, 1); Thread.sleep(ttl + 100); @@ -278,7 +278,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache long ttl = 500; - grid(0).jcache(null). + grid(0).cache(null). withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl))).put(key, 1); Thread.sleep(ttl + 100); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java index 9e947df..1a78a47 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java @@ -69,7 +69,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { for (int i = 0; i < gridCount(); i++) - grid(i).jcache(null).removeAll(); + grid(i).cache(null).removeAll(); super.afterTest(); } @@ -124,7 +124,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe long ttl = 500; - grid(0).jcache(null). + grid(0).cache(null). withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl))).put(key, 1); Thread.sleep(ttl + 100); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java index 31b47d7..fd78f52 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java @@ -34,7 +34,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA * @throws Exception If failed. */ public void testEntryProcessorRemove() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(1, 20); @@ -68,7 +68,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA * @throws Exception If failed. */ public void testCacheStatistics() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(1, 10); @@ -108,7 +108,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA * @throws Exception If failed. */ public void testConditionReplace() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); long hitCount = 0; long missCount = 0; @@ -158,7 +158,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA * @throws Exception If failed. */ public void testPutIfAbsent() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); long hitCount = 0; long missCount = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java index 4a1d1b0..031d399 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java @@ -110,7 +110,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest { try { GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { - grid(0).jcache(null).get(nearKey()); + grid(0).cache(null).get(nearKey()); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java index fe875f9..b8dafc6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java @@ -91,7 +91,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { startGridsMultiThreaded(gridCnt); try { - IgniteCache<Integer, String> c = grid(0).jcache(null); + IgniteCache<Integer, String> c = grid(0).cache(null); int cnt = 100; @@ -121,7 +121,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { private Ignite ignite; @Override public Object call() throws Exception { - IgniteCache<Integer, String> c = ignite.jcache(null); + IgniteCache<Integer, String> c = ignite.cache(null); for (int i = 0; i < cnt; i++) c.put(i, Integer.toString(i)); @@ -154,7 +154,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { private Ignite ignite; @Override public Object call() throws Exception { - IgniteCache<Integer, String> c = ignite.jcache(null); + IgniteCache<Integer, String> c = ignite.cache(null); for (int i = 0; i < cnt; i++) c.put(i, Integer.toString(i));
