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/GridCacheNearMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java index 2c52928..f425812 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java @@ -66,11 +66,11 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - g.jcache(null).removeAll(); + g.cache(null).removeAll(); assert internalCache(i).isEmpty(); - g.jcache(null).mxBean().clear(); + g.cache(null).mxBean().clear(); } } @@ -81,7 +81,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - g.jcache(null).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(true); + g.cache(null).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(true); } } @@ -101,7 +101,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testPrimaryPut() throws Exception { Ignite g0 = grid(0); - IgniteCache<Integer, Integer> cache0 = g0.jcache(null); + IgniteCache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -127,7 +127,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { info("Checking grid: " + g.name()); - IgniteCache<Object, Object> jcache = g.jcache(null); + IgniteCache<Object, Object> jcache = g.cache(null); info("Puts: " + jcache.metrics().getCachePuts()); info("Reads: " + jcache.metrics().getCacheGets()); @@ -156,7 +156,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testBackupPut() throws Exception { Ignite g0 = grid(0); - IgniteCache<Integer, Integer> cache0 = g0.jcache(null); + IgniteCache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -179,7 +179,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { for (int j = 0; j < gridCount(); j++) { Ignite g = grid(j); - IgniteCache<Object, Object> jcache = g.jcache(null); + IgniteCache<Object, Object> jcache = g.cache(null); if (affinity(jcache).isPrimaryOrBackup(g.cluster().localNode(), key)) assertEquals(1, jcache.metrics().getCachePuts()); @@ -210,7 +210,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testNearPut() throws Exception { Ignite g0 = grid(0); - IgniteCache<Integer, Integer> cache0 = g0.jcache(null); + IgniteCache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -234,7 +234,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { for (int j = 0; j < gridCount(); j++) { Ignite g = grid(j); - IgniteCache<Object, Object> jcache = g.jcache(null); + IgniteCache<Object, Object> jcache = g.cache(null); assertEquals(1, jcache.metrics().getCachePuts()); @@ -262,7 +262,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testPrimaryRead() throws Exception { Ignite g0 = grid(0); - IgniteCache<Integer, Integer> cache0 = g0.jcache(null); + IgniteCache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -292,7 +292,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { info("Checking grid: " + g.name()); - IgniteCache<Object, Object> jcache = g.jcache(null); + IgniteCache<Object, Object> jcache = g.cache(null); info("Writes: " + jcache.metrics().getCachePuts()); info("Reads: " + jcache.metrics().getCacheGets()); @@ -318,7 +318,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testBackupRead() throws Exception { Ignite g0 = grid(0); - IgniteCache<Integer, Integer> cache0 = g0.jcache(null); + IgniteCache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -346,7 +346,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { for (int j = 0; j < gridCount(); j++) { Ignite g = grid(j); - IgniteCache<Object, Object> jcache = g.jcache(null); + IgniteCache<Object, Object> jcache = g.cache(null); assertEquals(0, jcache.metrics().getCachePuts()); @@ -369,7 +369,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testNearRead() throws Exception { Ignite g0 = grid(0); - IgniteCache<Integer, Integer> cache0 = g0.jcache(null); + IgniteCache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -394,7 +394,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { for (int j = 0; j < gridCount(); j++) { Ignite g = grid(j); - IgniteCache<Object, Object> jcache = g.jcache(null); + IgniteCache<Object, Object> jcache = g.cache(null); assertEquals(0, jcache.metrics().getCachePuts());
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/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index e243f17..37e5b90 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -101,7 +101,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); - IgniteCache<Integer, String> c = g.jcache(null); + IgniteCache<Integer, String> c = g.cache(null); c.removeAll(); @@ -220,7 +220,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { private void checkDoubleGet(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put) throws Exception { IgniteEx ignite = grid(0); - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); Integer key = 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/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index 1227f9f..94a64ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -319,11 +319,11 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { backup = grid(0); } - assertEquals(String.valueOf(key), backup.jcache(null).get(key)); + assertEquals(String.valueOf(key), backup.cache(null).get(key)); - primary.jcache(null).put(key, "a"); + primary.cache(null).put(key, "a"); - assertEquals("a", backup.jcache(null).get(key)); + assertEquals("a", backup.cache(null).get(key)); } /** @throws Exception If failed. */ 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/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index 8923865..b91ce5e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -61,7 +61,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio if (clientHasNearCache()) ignite(i).createNearCache(null, new NearCacheConfiguration<>()); else - ignite(i).jcache(null); + ignite(i).cache(null); break; } 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/GridCacheNearOnlyTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java index 30bba62..2893678 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java @@ -170,10 +170,10 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { } for (int i = 0; i < 10; i++) - grid(1).jcache(null).put(i, i); + grid(1).cache(null).put(i, i); final Ignite igniteNearOnly = grid(0); - final IgniteCache<Object, Object> nearOnly = igniteNearOnly.jcache(null); + final IgniteCache<Object, Object> nearOnly = igniteNearOnly.cache(null); // Populate near cache. for (int i = 0; i < 10; i++) { 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/GridCacheNearPartitionedClearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java index f2f16d6..72a8872 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java @@ -28,8 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.configuration.*; - import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheRebalanceMode.*; @@ -148,6 +146,6 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes * @return Cache. */ private IgniteCache cacheForIndex(int idx) { - return grid(idx).jcache(CACHE_NAME); + return grid(idx).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/distributed/near/GridCacheNearReaderPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java index f3446bb..052e9f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java @@ -103,9 +103,9 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest { info("Node 2: " + node2.cluster().localNode().id()); info("Node 3: " + node3.cluster().localNode().id()); - cache1 = node1.jcache(CACHE_NAME); - cache2 = node2.jcache(CACHE_NAME); - cache3 = node3.jcache(CACHE_NAME); + cache1 = node1.cache(CACHE_NAME); + cache2 = node2.cache(CACHE_NAME); + cache3 = node3.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/distributed/near/GridCacheNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java index d2d37d3..1ab738f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java @@ -143,8 +143,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { Ignite g1 = grid(n1.id()); Ignite g2 = grid(n2.id()); - IgniteCache<Integer, String> cache1 = g1.jcache(null); - IgniteCache<Integer, String> cache2 = g2.jcache(null); + IgniteCache<Integer, String> cache1 = g1.cache(null); + IgniteCache<Integer, String> cache2 = g2.cache(null); // Store some values in cache. assertNull(cache1.getAndPut(1, "v1")); @@ -225,8 +225,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { ((IgniteKernal)g1).internalCache(null).preloader().request(cacheKeys, new AffinityTopologyVersion(2)).get(); ((IgniteKernal)g2).internalCache(null).preloader().request(cacheKeys, new AffinityTopologyVersion(2)).get(); - IgniteCache<Integer, String> cache1 = g1.jcache(null); - IgniteCache<Integer, String> cache2 = g2.jcache(null); + IgniteCache<Integer, String> cache1 = g1.cache(null); + IgniteCache<Integer, String> cache2 = g2.cache(null); assertEquals(g1.affinity(null).mapKeyToNode(1), g1.cluster().localNode()); assertFalse(g1.affinity(null).mapKeyToNode(2).equals(g1.cluster().localNode())); @@ -304,8 +304,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { startGrids(); try { - IgniteCache<Object, Object> prj0 = grid(0).jcache(null); - IgniteCache<Object, Object> prj1 = grid(1).jcache(null); + IgniteCache<Object, Object> prj0 = grid(0).cache(null); + IgniteCache<Object, Object> prj1 = grid(1).cache(null); Map<Integer, Integer> putMap = new HashMap<>(); @@ -340,9 +340,9 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { startGrids(); try { - IgniteCache<Object, Object> prj0 = grid(0).jcache(null); - IgniteCache<Object, Object> prj1 = grid(1).jcache(null); - IgniteCache<Object, Object> prj2 = grid(2).jcache(null); + IgniteCache<Object, Object> prj0 = grid(0).cache(null); + IgniteCache<Object, Object> prj1 = grid(1).cache(null); + IgniteCache<Object, Object> prj2 = grid(2).cache(null); Map<Integer, Integer> putMap = new HashMap<>(); @@ -398,8 +398,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { assertFalse("Nodes cannot be equal: " + primary, primary.equals(backup)); - IgniteCache<Integer, String> cache1 = grid(primary.id()).jcache(null); - IgniteCache<Integer, String> cache2 = grid(backup.id()).jcache(null); + IgniteCache<Integer, String> cache1 = grid(primary.id()).cache(null); + IgniteCache<Integer, String> cache2 = grid(backup.id()).cache(null); // Store a values in cache. assertNull(cache1.getAndPut(1, "v1")); 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/GridCacheNearTxMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java index 39e0bfd..e890d39 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java @@ -114,7 +114,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { // Update main key from all nodes. for (Ignite g : ignites) - g.jcache(null).put(mainKey, ++cntr); + g.cache(null).put(mainKey, ++cntr); info("Updated mainKey from all nodes."); @@ -128,10 +128,10 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { Ignite g = F.rand(ignites); - g.jcache(null).put(new CacheAffinityKey<>(i, mainKey), Integer.toString(cntr++)); + g.cache(null).put(new CacheAffinityKey<>(i, mainKey), Integer.toString(cntr++)); } - IgniteCache cache = priIgnite.jcache(null); + IgniteCache cache = priIgnite.cache(null); Transaction tx = priIgnite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ); @@ -195,7 +195,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { */ private void testReadersUpdate(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { Ignite ignite = grid(0); - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); try (Transaction tx = ignite.transactions().txStart(concurrency, isolation)) { for (int i = 0; i < 100; i++) @@ -206,7 +206,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { // Create readers. for (int g = 0; g < GRID_CNT; g++) { - IgniteCache<Integer, Integer> c = grid(g).jcache(null); + IgniteCache<Integer, Integer> c = grid(g).cache(null); for (int i = 0; i < 100; i++) assertEquals((Integer)1, c.get(i)); @@ -220,7 +220,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { } for (int g = 0; g < GRID_CNT; g++) { - IgniteCache<Integer, Integer> c = grid(g).jcache(null); + IgniteCache<Integer, Integer> c = grid(g).cache(null); for (int i = 0; i < 100; i++) assertEquals((Integer)2, c.get(i)); 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/GridCachePartitionedAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index 24cac3c..8a979a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -150,7 +150,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest /** @param g Grid. */ private static void partitionMap(Ignite g) { X.println(">>> Full partition map for grid: " + g.name()); - X.println(">>> " + dht(g.jcache(null)).topology().partitionMap(false).toFullString()); + X.println(">>> " + dht(g.cache(null)).topology().partitionMap(false).toFullString()); } /** @throws Exception If failed. */ @@ -165,7 +165,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest Ignite mg = grid(0); - IgniteCache<Integer, String> mc = mg.jcache(null); + IgniteCache<Integer, String> mc = mg.cache(null); int keyCnt = 10; 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/GridCachePartitionedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java index d54f73b..378dcf5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java @@ -95,7 +95,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT * @return Cache. */ private IgniteCache<String, Integer> cache(ClusterNode node) { - return G.ignite(node.id()).jcache(null); + return G.ignite(node.id()).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/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 706a4e3..f5eb189 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -113,7 +113,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac long misses = 0; for (int i = 0; i < GRID_CNT; i++) { - CacheMetrics m = grid(i).jcache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); hits += m.getCacheHits(); misses += m.getCacheMisses(); 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/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 54d8fba..ae25908 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -240,7 +240,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst X.println("*** Retries: " + RETRIES); X.println("*** Log frequency: " + LOG_FREQ); - CacheAffinity<String> aff = affinity(grid(0).<String, Integer>jcache(null)); + CacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null)); Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY); @@ -260,7 +260,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst final UUID priId = pri.cluster().localNode().id(); // Initialize. - pri.jcache(null).put(CNTR_KEY, 0); + pri.cache(null).put(CNTR_KEY, 0); // nears.get(0).cache(null).put(CNTR_KEY, 0); assertNull(near(pri).peekEx(CNTR_KEY)); @@ -305,7 +305,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) info("***"); - IgniteCache<String, Integer> c = pri.jcache(null); + IgniteCache<String, Integer> c = pri.cache(null); Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); @@ -402,7 +402,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) info("***"); - IgniteCache<String, Integer> c = near.jcache(null); + IgniteCache<String, Integer> c = near.cache(null); Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); @@ -487,7 +487,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst dht(g).context().tm().printMemoryStats(); near(g).context().tm().printMemoryStats(); - IgniteCache<String, Integer> cache = grid(i).jcache(null); + IgniteCache<String, Integer> cache = grid(i).cache(null); int cntr = nearThreads > 0 && nears.contains(g) ? cache.get(CNTR_KEY) : cache.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); @@ -542,7 +542,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst * @throws Exception If failed. */ private void checkNearAndPrimaryMultiNode(int gridCnt) throws Exception { - CacheAffinity<String> aff = affinity(grid(0).<String, Integer>jcache(null)); + CacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null)); Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY); @@ -551,7 +551,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst Ignite pri = G.ignite(F.first(affNodes).id()); // Initialize. - pri.jcache(null).put(CNTR_KEY, 0); + pri.cache(null).put(CNTR_KEY, 0); assertNull(near(pri).peekEx(CNTR_KEY)); @@ -575,7 +575,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst for (int i = 0; i < gridCnt; i++) { Ignite g = grid(i); - IgniteCache<String, Integer> cache = grid(i).jcache(null); + IgniteCache<String, Integer> cache = grid(i).cache(null); int cntr = cache.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); @@ -639,7 +639,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) log.info("***"); - IgniteCache<String, Integer> c = near.jcache(null); + IgniteCache<String, Integer> c = near.cache(null); Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); @@ -708,7 +708,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) log.info("***"); - IgniteCache<String, Integer> c = pri.jcache(null); + IgniteCache<String, Integer> c = pri.cache(null); Integer oldCntr = c.localPeek(CNTR_KEY, 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/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index dfafc5c..efd2f45 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -77,8 +76,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < size; i++) putMap.put(i, i * i); - IgniteCache<Object, Object> c0 = grid(0).jcache(null); - IgniteCache<Object, Object> c1 = grid(1).jcache(null); + IgniteCache<Object, Object> c0 = grid(0).cache(null); + IgniteCache<Object, Object> c1 = grid(1).cache(null); c0.putAll(putMap); @@ -106,8 +105,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < size; i++) putMap.put(i, i); - IgniteCache<Object, Object> prj0 = grid(0).jcache(null); - IgniteCache<Object, Object> prj1 = grid(1).jcache(null); + IgniteCache<Object, Object> prj0 = grid(0).cache(null); + IgniteCache<Object, Object> prj1 = grid(1).cache(null); prj0.putAll(putMap); @@ -140,7 +139,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti int size = 10; - IgniteCache<Object, Object> prj0 = grid(0).jcache(null); + IgniteCache<Object, Object> prj0 = grid(0).cache(null); for (int i = 0; i < size; i++) { info("Putting value [i=" + i + ']'); @@ -153,7 +152,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < gridCount(); i++) { assertEquals(0, context(i).tm().idMapSize()); - IgniteCache<Object, Object> cache = grid(i).jcache(null); + IgniteCache<Object, Object> cache = grid(i).cache(null); ClusterNode node = grid(i).localNode(); for (int k = 0; k < size; k++) { @@ -391,7 +390,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("All affinity nodes: " + affinityNodes()); - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); info("Cache affinity 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/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index 0db5d95..58c89b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -103,7 +103,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA super.afterTest(); if (GRID_CNT > 0) - grid(0).jcache(null).removeAll(); + grid(0).cache(null).removeAll(); for (int i = 0; i < GRID_CNT; i++) { internalCache(i).clearLocally(); @@ -179,7 +179,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA multithreaded(new CAX() { @SuppressWarnings({"BusyWait"}) @Override public void applyx() { - IgniteCache<Integer, Integer> c = grid(0).jcache(null); + IgniteCache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { int kv = cntr.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index 034f8d2..6c7473a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -85,8 +85,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo @Override public void onLifecycleEvent(LifecycleEventType evt) { switch (evt) { case AFTER_NODE_START: { - IgniteCache<Object, MyValue> c1 = ignite.jcache("one"); - IgniteCache<Object, MyValue> c2 = ignite.jcache("two"); + IgniteCache<Object, MyValue> c1 = ignite.cache("one"); + IgniteCache<Object, MyValue> c2 = ignite.cache("two"); if (!ignite.name().contains("Test0")) { info("Keys already in cache:"); @@ -144,8 +144,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - IgniteCache<Object, MyValue> c1 = grid(j).jcache("one"); - IgniteCache<Object, MyValue> c2 = grid(j).jcache("two"); + IgniteCache<Object, MyValue> c1 = grid(j).cache("one"); + IgniteCache<Object, MyValue> c2 = grid(j).cache("two"); int k = 0; @@ -191,7 +191,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo try { Object v1 = e.getValue(); - Object v2 = grid.jcache("one").get(key); + Object v2 = grid.cache("one").get(key); assertNotNull(v2); assertEquals(v1, v2); 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/GridCachePartitionedStorePutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java index 74c20b0..5eca3f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java @@ -28,7 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.configuration.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; @@ -96,9 +95,9 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - cache1 = startGrid(1).jcache(null); - cache2 = startGrid(2).jcache(null); - cache3 = startGrid(3).jcache(null); + cache1 = startGrid(1).cache(null); + cache2 = startGrid(2).cache(null); + cache3 = startGrid(3).cache(null); } /** {@inheritDoc} */ 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/GridCachePutArrayValueSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java index 94eb014..d357b3d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java @@ -51,7 +51,7 @@ public class GridCachePutArrayValueSelfTest extends GridCacheAbstractSelfTest { public void testInternalKeys() throws Exception { assert gridCount() >= 2; - IgniteCache<InternalKey, Object> jcache = grid(0).jcache(null); + IgniteCache<InternalKey, Object> jcache = grid(0).cache(null); final InternalKey key = new InternalKey(0); // Hangs on the first remote put. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java index 74de525..38e612c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java @@ -28,8 +28,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; - /** * Tests rendezvous affinity function with CLIENT_ONLY node (GG-8768). */ @@ -72,7 +70,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac Map<Integer, Collection<UUID>> mapping = new HashMap<>(); for (int i = 0; i < 4; i++) { - IgniteCache<Object, Object> cache = grid(i).jcache(null); + IgniteCache<Object, Object> cache = grid(i).cache(null); CacheAffinity<Object> aff = affinity(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/near/GridPartitionedBackupLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java index 4a0ea8c..721a4f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java @@ -27,7 +27,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -104,7 +103,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testBackupLoad() throws Exception { - grid(0).jcache(null).put(1, 1); + grid(0).cache(null).put(1, 1); assert store.get(1) == 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/near/IgniteCacheNearReadCommittedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java index a166240..254cf09 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java @@ -51,7 +51,7 @@ public class IgniteCacheNearReadCommittedTest extends GridCacheAbstractSelfTest * @throws Exception If failed. */ public void testReadCommittedCacheCleanup() throws Exception { - IgniteCache<Integer, Integer> cache = ignite(0).jcache(null); + IgniteCache<Integer, Integer> cache = ignite(0).cache(null); Integer key = backupKey(cache); @@ -65,7 +65,7 @@ public class IgniteCacheNearReadCommittedTest extends GridCacheAbstractSelfTest tx.commit(); } - ignite(1).jcache(null).remove(key); // Remove from primary node. + ignite(1).cache(null).remove(key); // Remove from primary node. assertEquals(0, cache.localSize()); } 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/IgniteTxReentryNearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java index b874228..c4074ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java @@ -44,7 +44,7 @@ public class IgniteTxReentryNearSelfTest extends IgniteTxReentryAbstractSelfTest @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/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index 73eaaec..d50cfe0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -79,8 +79,8 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac assert g1.cluster().nodes().size() > 1 : "This test needs at least two grid nodes started."; - IgniteCache<Object, Object> cache1 = g1.jcache(null); - IgniteCache<Object, Object> cache2 = g2.jcache(null); + IgniteCache<Object, Object> cache1 = g1.cache(null); + IgniteCache<Object, Object> cache2 = g2.cache(null); try { ClassLoader ldr = new GridTestClassLoader( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java index d36f008..9e6fc37 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java @@ -98,7 +98,7 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe Ignite g1 = startGrid(1); for (int i = 0; i < keyCnt; i++) - g0.jcache(null).put(i, i); + g0.cache(null).put(i, i); assertEquals(keyCnt, ((IgniteKernal)g0).internalCache(null).size()); assertEquals(keyCnt, ((IgniteKernal)g1).internalCache(null).size()); @@ -129,7 +129,7 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe Ignite g1 = startGrid(1); for (int i = 0; i < keyCnt; i++) - g0.jcache(null).put(i, i); + g0.cache(null).put(i, i); assertEquals(keyCnt, ((IgniteKernal)g0).internalCache(null).size()); assertEquals(keyCnt, ((IgniteKernal)g1).internalCache(null).size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index c51e6b5..7145d76 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -87,8 +87,8 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa @Override public void onLifecycleEvent(LifecycleEventType evt) { switch (evt) { case AFTER_NODE_START: { - IgniteCache<Object, MyValue> c1 = ignite.jcache("one"); - IgniteCache<Object, MyValue> c2 = ignite.jcache("two"); + IgniteCache<Object, MyValue> c1 = ignite.cache("one"); + IgniteCache<Object, MyValue> c2 = ignite.cache("two"); if (!ignite.name().contains("Test0")) { if (!quiet) { @@ -148,8 +148,8 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - IgniteCache<String, MyValue> c1 = grid(j).jcache("one"); - IgniteCache<String, MyValue> c2 = grid(j).jcache("two"); + IgniteCache<String, MyValue> c1 = grid(j).cache("one"); + IgniteCache<String, MyValue> c2 = grid(j).cache("two"); int size1 = c1.localSize(); int size2 = c2.localSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 1b4d24b..d60d7d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -217,8 +217,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - IgniteCache<Integer, Object> cache1 = g1.jcache(null); - IgniteCache<Integer, Object> cache2 = g2.jcache(null); + IgniteCache<Integer, Object> cache1 = g1.cache(null); + IgniteCache<Integer, Object> cache2 = g2.cache(null); ClassLoader ldr = new GridTestClassLoader( GridCacheReplicatedPreloadSelfTest.class.getName(), @@ -244,7 +244,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { Ignite g3 = startGrid(3); - IgniteCache<Integer, Object> cache3 = g3.jcache(null); + IgniteCache<Integer, Object> cache3 = g3.cache(null); Object v3 = cache3.localPeek(1, CachePeekMode.ONHEAP); @@ -270,14 +270,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 512; try { - IgniteCache<Integer, String> cache1 = startGrid(1).jcache(null); + IgniteCache<Integer, String> cache1 = startGrid(1).cache(null); int keyCnt = 1000; for (int i = 0; i < keyCnt; i++) cache1.put(i, "val" + i); - IgniteCache<Integer, String> cache2 = startGrid(2).jcache(null); + IgniteCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(keyCnt, cache2.localSize()); } @@ -294,14 +294,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 256; try { - IgniteCache<Integer, String> cache1 = startGrid(1).jcache(null); + IgniteCache<Integer, String> cache1 = startGrid(1).cache(null); int keyCnt = 2000; for (int i = 0; i < keyCnt; i++) cache1.put(i, "val" + i); - IgniteCache<Integer, String> cache2 = startGrid(2).jcache(null); + IgniteCache<Integer, String> cache2 = startGrid(2).cache(null); int size = cache2.localSize(); @@ -348,14 +348,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 1; // 1 byte but one entry should be in batch anyway. try { - IgniteCache<Integer, String> cache1 = startGrid(1).jcache(null); + IgniteCache<Integer, String> cache1 = startGrid(1).cache(null); int cnt = 100; for (int i = 0; i < cnt; i++) cache1.put(i, "val" + i); - IgniteCache<Integer, String> cache2 = startGrid(2).jcache(null); + IgniteCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(cnt, cache2.localSize()); } @@ -372,14 +372,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 1000; // 1000 bytes. try { - IgniteCache<Integer, String> cache1 = startGrid(1).jcache(null); + IgniteCache<Integer, String> cache1 = startGrid(1).cache(null); int cnt = 100; for (int i = 0; i < cnt; i++) cache1.put(i, "val" + i); - IgniteCache<Integer, String> cache2 = startGrid(2).jcache(null); + IgniteCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(cnt, cache2.localSize()); } @@ -396,14 +396,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { batchSize = 10000; // 10000 bytes. try { - IgniteCache<Integer, String> cache1 = startGrid(1).jcache(null); + IgniteCache<Integer, String> cache1 = startGrid(1).cache(null); int cnt = 100; for (int i = 0; i < cnt; i++) cache1.put(i, "val" + i); - IgniteCache<Integer, String> cache2 = startGrid(2).jcache(null); + IgniteCache<Integer, String> cache2 = startGrid(2).cache(null); assertEquals(cnt, cache2.localSize()); } @@ -434,7 +434,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < cnt; i++) { if (i % 100 == 0) { if (map != null && !map.isEmpty()) { - grid(0).jcache(null).putAll(map); + grid(0).cache(null).putAll(map); info("Put entries count: " + i); } @@ -446,7 +446,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { } if (map != null && !map.isEmpty()) - grid(0).jcache(null).putAll(map); + grid(0).cache(null).putAll(map); for (int gridIdx = 0; gridIdx < gridCnt; gridIdx++) { assert internalCache(gridIdx).size() == cnt : "Actual size: " + internalCache(gridIdx).size(); @@ -454,7 +454,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { info("Cache size is OK for grid index: " + gridIdx); } - IgniteCache<Integer, String> lastCache = startGrid(gridCnt).jcache(null); + IgniteCache<Integer, String> lastCache = startGrid(gridCnt).cache(null); // Let preloading start. Thread.sleep(1000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadUndeploysTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadUndeploysTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadUndeploysTest.java index e333e0a..e39a42b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadUndeploysTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadUndeploysTest.java @@ -49,7 +49,7 @@ public class GridCacheReplicatedPreloadUndeploysTest { for (int i = 0; i < cnt; i++) { if (i % 200 == 0) { if (map != null && !map.isEmpty()) { - g.jcache("replicated").putAll(map); + g.cache("replicated").putAll(map); X.println(">>> Put entries count: " + i); } @@ -61,7 +61,7 @@ public class GridCacheReplicatedPreloadUndeploysTest { } if (map != null && !map.isEmpty()) { - g.jcache("replicated").putAll(map); + g.cache("replicated").putAll(map); X.println(">>> Put entries count: " + cnt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java index f3757c2..0c56fc4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java @@ -27,7 +27,6 @@ import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; -import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.atomic.*; @@ -117,7 +116,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest final AtomicInteger evictedKeysCnt = new AtomicInteger(); - final IgniteCache<Object, Object> cache = g.jcache(null); + final IgniteCache<Object, Object> cache = g.cache(null); cache.loadCache(null, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index b45ce33..0972d99 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -171,7 +171,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb try { final Ignite ignite = startGrid(1); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index 01633b2..2fdd902 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; @@ -125,7 +124,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest try { Ignite ignite = startGrid(1); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); // Warm up. for (int i = 0; i < warmUpPutsCnt; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 1b09f96..3dbac92 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -133,7 +133,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes Ignite g = startGrid(0); - final IgniteCache<Integer, Integer> cache = g.jcache(null); + final IgniteCache<Integer, Integer> cache = g.cache(null); for (int i = 1; i < 20; i++) { cache.put(i * gridCnt, i * gridCnt); @@ -149,7 +149,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes Ignite ignite = grid(0); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); // Put 1 entry to primary node. cache.put(0, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index 746b79a..298d233 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -32,8 +32,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 static org.apache.ignite.cache.CacheAtomicityMode.*; @@ -169,7 +167,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb Ignite g = startGrids(); - IgniteCache<String, String> cache = g.jcache(null); + IgniteCache<String, String> cache = g.cache(null); try { info(">>> Checking policy [txConcurrency=" + txConcurrency + ", txIsolation=" + txIsolation + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index ac50b62..7ea3be9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -315,7 +315,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic int cnt = 500; for (int i = 0; i < cnt; i++) { - IgniteCache<Integer, String> cache = grid(rand.nextInt(2)).jcache(null); + IgniteCache<Integer, String> cache = grid(rand.nextInt(2)).cache(null); int key = rand.nextInt(100); String val = Integer.toString(key); @@ -368,7 +368,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic for (int i = 0; i < cnt && !Thread.currentThread().isInterrupted(); i++) { IgniteEx grid = grid(rand.nextInt(2)); - IgniteCache<Integer, String> cache = grid.jcache(null); + IgniteCache<Integer, String> cache = grid.cache(null); int key = rand.nextInt(1000); String val = Integer.toString(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java index dbbd70f..6d267ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java @@ -28,7 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import javax.cache.*; -import java.io.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -138,7 +137,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { try { Ignite g = grid(0); - IgniteCache<Object, Object> c = g.jcache(null); + IgniteCache<Object, Object> c = g.cache(null); int cnt = 1; @@ -193,7 +192,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); - IgniteCache<Object, Object> cache = g.jcache(null); + IgniteCache<Object, Object> cache = g.cache(null); try { int id = 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index 75fdeef..b21f217 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; import javax.cache.*; -import javax.cache.configuration.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; @@ -116,7 +115,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); final Random rnd = new Random(); @@ -168,7 +167,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 100; i++) cache.put(i, i); @@ -195,7 +194,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); Collection<Integer> keys = new ArrayList<>(100); @@ -227,7 +226,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrid(1); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 10000; 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/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java index 9dcd736..6e8747d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java @@ -294,7 +294,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends Ignite ignite = startGrid(); try { - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); int cnt = 500; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java index 175ef81..7f30879 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java @@ -342,7 +342,7 @@ public class GridCacheLruEvictionPolicySelfTest extends Ignite ignite = startGrid(); try { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); int cnt = 500; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java index 7da7e45..3fc0605 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; 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.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -121,7 +120,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe info("Getting " + cnt + " keys from cache."); for (int i = 0; i < cnt; i++) { - IgniteCache<Integer, String> cache = grid(rand.nextInt(GRID_COUNT)).jcache(null); + IgniteCache<Integer, String> cache = grid(rand.nextInt(GRID_COUNT)).cache(null); assertTrue(cache.get(i).equals(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java index 205cac2..7ec2c07 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java @@ -156,7 +156,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb info("Getting " + cnt + " keys from cache."); for (int i = 0; i < cnt; i++) { - IgniteCache<Integer, String> cache = grid(0).jcache(null); + IgniteCache<Integer, String> cache = grid(0).cache(null); assertTrue(cache.get(i).equals(Integer.toString(i))); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java index d14e1a0..ccc2fe0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java @@ -46,10 +46,10 @@ public class GridCacheRandomEvictionPolicySelfTest extends for (int i = 0; i < keys; i++) { String s = Integer.toString(i); - g.jcache(null).put(s, s); + g.cache(null).put(s, s); } - assert g.jcache(null).size() <= max; + assert g.cache(null).size() <= max; } finally { stopAllGrids(); @@ -84,15 +84,15 @@ public class GridCacheRandomEvictionPolicySelfTest extends int j = rand.nextInt(t.length); if (rmv) - g.jcache(null).remove(t[j]); + g.cache(null).remove(t[j]); else - g.jcache(null).put(t[j], t[j]); + g.cache(null).put(t[j], t[j]); if (i % 1000 == 0) info("Stats [cntr=" + i + ", total=" + runs + ']'); } - assert g.jcache(null).size() <= max; + assert g.cache(null).size() <= max; info(policy(0)); } @@ -185,9 +185,9 @@ public class GridCacheRandomEvictionPolicySelfTest extends int j = rand.nextInt(t.length); if (rmv) - g.jcache(null).remove(t[j]); + g.cache(null).remove(t[j]); else - g.jcache(null).put(t[j], t[j]); + g.cache(null).put(t[j], t[j]); if (i != 0 && i % 1000 == 0) info("Stats [cntr=" + i + ", total=" + runs + ']'); @@ -197,7 +197,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends } }, 10); - assert g.jcache(null).size() <= max; + assert g.cache(null).size() <= max; info(policy(0)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java index 1a67d52..53ec1f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java @@ -27,7 +27,6 @@ import org.apache.ignite.resources.*; import org.jetbrains.annotations.*; import javax.cache.*; -import javax.cache.configuration.*; import javax.cache.integration.*; import javax.cache.processor.*; import java.util.*; @@ -104,11 +103,11 @@ public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbs public void testStoreSession() throws Exception { assertNull(jcache(0).getName()); - assertEquals(CACHE_NAME1, ignite(0).jcache(CACHE_NAME1).getName()); + assertEquals(CACHE_NAME1, ignite(0).cache(CACHE_NAME1).getName()); testStoreSession(jcache(0)); - testStoreSession(ignite(0).jcache(CACHE_NAME1)); + testStoreSession(ignite(0).cache(CACHE_NAME1)); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java index 4e2abe3..d846881 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java @@ -27,7 +27,6 @@ import org.apache.ignite.resources.*; import org.jetbrains.annotations.*; import javax.cache.*; -import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*; import java.util.concurrent.*; @@ -110,7 +109,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign * @throws Exception If failed. */ private void testCache(String cacheName) throws Exception { - IgniteCache<Integer, Integer> cache = ignite(0).jcache(cacheName); + IgniteCache<Integer, Integer> cache = ignite(0).cache(cacheName); try { latch = new CountDownLatch(2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java index aa8f480..269b9ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java @@ -60,7 +60,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra public void testStoreSessionTx() throws Exception { testTxPut(jcache(0), null, null); - testTxPut(ignite(0).jcache(CACHE_NAME1), null, null); + testTxPut(ignite(0).cache(CACHE_NAME1), null, null); testTxRemove(null, null); @@ -249,9 +249,9 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra * @throws Exception If failed. */ public void testSessionCrossCacheTx() throws Exception { - IgniteCache<Object, Object> cache0 = ignite(0).jcache(null); + IgniteCache<Object, Object> cache0 = ignite(0).cache(null); - IgniteCache<Object, Object> cache1 = ignite(0).jcache(CACHE_NAME1); + IgniteCache<Object, Object> cache1 = ignite(0).cache(CACHE_NAME1); Integer key1 = primaryKey(cache0); Integer key2 = primaryKeys(cache1, 1, key1 + 1).get(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java index 2429ac0..a604eb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java @@ -29,7 +29,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @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); @@ -63,7 +63,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @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); @@ -103,7 +103,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @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; @@ -153,7 +153,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL * @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;
