http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java index 0766817..9df66b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java @@ -131,12 +131,12 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest { try { startGrids(2); - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); cache.put("key", valCls.newInstance()); for (int i = 0; i < 2; i++) - assertNotNull("For grid: " + i, grid(i).jcache(null).localPeek("key", CachePeekMode.ONHEAP)); + assertNotNull("For grid: " + i, grid(i).cache(null).localPeek("key", CachePeekMode.ONHEAP)); for (MessageCountingCommunicationSpi spi : commSpis.values()) { assertTrue(spi.deploymentMessageCount() > 0); @@ -150,7 +150,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest { cache.put(key, valCls.newInstance()); for (int k = 0; k < 2; k++) - assertNotNull(grid(k).jcache(null).localPeek(key, CachePeekMode.ONHEAP)); + assertNotNull(grid(k).cache(null).localPeek(key, CachePeekMode.ONHEAP)); } for (MessageCountingCommunicationSpi spi : commSpis.values())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java index 1ad7cb9..46ebb8b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java @@ -107,7 +107,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe } for (int i = 0; i < PERM_NODES_CNT + TMP_NODES_CNT; i++) - F.rand(alive).jcache(null).put(i, String.valueOf(i)); + F.rand(alive).cache(null).put(i, String.valueOf(i)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java index 360d8f8..09a24b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java @@ -117,7 +117,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb assertEquals(NODES_CNT * 2, grid1.cluster().nodes().size()); assertEquals(NODES_CNT * 2, grid2.cluster().nodes().size()); - IgniteCache<Integer, Integer> cache = grid2.jcache(CACHE_NAME); + IgniteCache<Integer, Integer> cache = grid2.cache(CACHE_NAME); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java index fa9a0c1..c31d235 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java @@ -403,6 +403,6 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac * @return Cache. */ private IgniteCache<String,Integer> cache(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/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 6ae34ea..60d2cc5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -1691,7 +1691,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int i = 0; i < gridCount(); i++) { info("Peek on node [i=" + i + ", id=" + grid(i).localNode().id() + ", val=" + - grid(i).jcache(null).localPeek("key", CachePeekMode.ONHEAP) + ']'); + grid(i).cache(null).localPeek("key", CachePeekMode.ONHEAP) + ']'); } assertEquals((Integer)1, cache.getAndPutIfAbsent("key", 2)); @@ -2000,10 +2000,10 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int i = 0; i < gridCount(); i++) { info("Peek key on grid [i=" + i + ", nodeId=" + grid(i).localNode().id() + - ", peekVal=" + grid(i).jcache(null).localPeek("key", CachePeekMode.ONHEAP) + ']'); + ", peekVal=" + grid(i).cache(null).localPeek("key", CachePeekMode.ONHEAP) + ']'); info("Peek key2 on grid [i=" + i + ", nodeId=" + grid(i).localNode().id() + - ", peekVal=" + grid(i).jcache(null).localPeek("key2", CachePeekMode.ONHEAP) + ']'); + ", peekVal=" + grid(i).cache(null).localPeek("key2", CachePeekMode.ONHEAP) + ']'); } assertEquals((Integer)6, cache.get("key2")); @@ -2280,7 +2280,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract putToStore(key, Integer.parseInt(key)); for (int g = 0; g < gridCount(); g++) - grid(g).jcache(null).localLoadCache(null); + grid(g).cache(null).localLoadCache(null); for (int g = 0; g < gridCount(); g++) { for (int i = 0; i < cnt; i++) { @@ -2611,7 +2611,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract ignite = grid(1); } - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); int key = 0; @@ -2636,9 +2636,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int g = 0; g < gridCount(); g++) { Ignite grid0 = grid(g); - grid0.jcache(null).removeAll(); + grid0.cache(null).removeAll(); - assertTrue(grid0.jcache(null).localSize() == 0); + assertTrue(grid0.cache(null).localSize() == 0); } } @@ -2903,7 +2903,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPeek() throws Exception { Ignite ignite = primaryIgnite("key"); - IgniteCache<String, Integer> cache = ignite.jcache(null); + IgniteCache<String, Integer> cache = ignite.cache(null); assert cache.localPeek("key", CachePeekMode.ONHEAP) == null; @@ -2935,7 +2935,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract private void checkPeekTxRemove(TransactionConcurrency concurrency) throws Exception { if (txEnabled()) { Ignite ignite = primaryIgnite("key"); - IgniteCache<String, Integer> cache = ignite.jcache(null); + IgniteCache<String, Integer> cache = ignite.cache(null); cache.put("key", 1); @@ -3059,7 +3059,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); - grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 1); + grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1); Thread.sleep(ttl + 100); @@ -3131,7 +3131,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract try (Transaction tx = grid(0).transactions().txStart()) { final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); - grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 1); + grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1); tx.commit(); } @@ -3618,7 +3618,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); - grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 1); + grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1); Thread.sleep(ttl + 100); @@ -3907,7 +3907,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @return Cache. */ protected IgniteCache<String, Integer> primaryCache(String key) { - return primaryIgnite(key).jcache(null); + return primaryIgnite(key).cache(null); } /** @@ -4166,19 +4166,19 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Ignite g = primaryIgnite(keyToRmv); - g.<String, Integer>jcache(null).localClear(keyToRmv); + g.<String, Integer>cache(null).localClear(keyToRmv); checkLocalRemovedKey(keyToRmv); - g.<String, Integer>jcache(null).put(keyToRmv, 1); + g.<String, Integer>cache(null).put(keyToRmv, 1); String keyToEvict = "key" + 30; g = primaryIgnite(keyToEvict); - g.<String, Integer>jcache(null).localEvict(Collections.singleton(keyToEvict)); + g.<String, Integer>cache(null).localEvict(Collections.singleton(keyToEvict)); - g.<String, Integer>jcache(null).localClear(keyToEvict); + g.<String, Integer>cache(null).localClear(keyToEvict); checkLocalRemovedKey(keyToEvict); } @@ -4190,14 +4190,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int i = 0; i < 500; ++i) { String key = "key" + i; - boolean found = primaryIgnite(key).jcache(null).localPeek(key) != null; + boolean found = primaryIgnite(key).cache(null).localPeek(key) != null; if (keyToRmv.equals(key)) { Collection<ClusterNode> nodes = grid(0).affinity(null).mapKeyToPrimaryAndBackups(key); for (int j = 0; j < gridCount(); ++j) { if (nodes.contains(grid(j).localNode()) && grid(j) != primaryIgnite(key)) - assertTrue("Not found on backup removed key ", grid(j).jcache(null).localPeek(key) != null); + assertTrue("Not found on backup removed key ", grid(j).cache(null).localPeek(key) != null); } assertFalse("Found removed key " + key, found); @@ -4235,14 +4235,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract info("Will clear keys on node: " + g.cluster().localNode().id()); - g.<String, Integer>jcache(null).localClearAll(keysToRmv); + g.<String, Integer>cache(null).localClearAll(keysToRmv); for (int i = 0; i < 500; ++i) { String key = "key" + i; Ignite ignite = primaryIgnite(key); - boolean found = ignite.jcache(null).localPeek(key) != null; + boolean found = ignite.cache(null).localPeek(key) != null; if (keysToRmv.contains(key)) assertFalse("Found removed key [key=" + key + ", node=" + ignite.cluster().localNode().id() + ']', @@ -4270,7 +4270,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Ignite g = primaryIgnite(key); - g.jcache(null).put(key, "value" + i); + g.cache(null).put(key, "value" + i); keys.get(g.name()).add(key); } @@ -4319,7 +4319,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Ignite g = primaryIgnite(key); - g.jcache(null).put(key, "value" + i); + g.cache(null).put(key, "value" + i); } if (async) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java index 5373a6c..157ba93 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java @@ -174,14 +174,14 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst public void testEvict() throws Exception { Ignite ignite1 = startGrid(1); - IgniteCache<Object, Object> cache = ignite1.jcache(null).withExpiryPolicy(new CreatedExpiryPolicy( + IgniteCache<Object, Object> cache = ignite1.cache(null).withExpiryPolicy(new CreatedExpiryPolicy( new Duration(TimeUnit.MILLISECONDS, 100L))); // Putting entry. for (int i = 0; i < KEYS; i++) cache.put(i, i); - // Wait when entry + // Wait when entry U.sleep(200); // Check that entry is evicted from cache, but local store does contain it. @@ -202,7 +202,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst public void testPrimaryNode() throws Exception { Ignite ignite1 = startGrid(1); - IgniteCache<Object, Object> cache = ignite1.jcache(null); + IgniteCache<Object, Object> cache = ignite1.cache(null); // Populate cache and check that local store has all value. for (int i = 0; i < KEYS; i++) @@ -249,7 +249,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst public void testBackupNode() throws Exception { Ignite ignite1 = startGrid(1); - IgniteCache<Object, Object> cache = ignite1.jcache(BACKUP_CACHE); + IgniteCache<Object, Object> cache = ignite1.cache(BACKUP_CACHE); for (int i = 0; i < KEYS; i++) cache.put(i, i); @@ -289,7 +289,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst public void testSwap() throws Exception { Ignite ignite1 = startGrid(1); - IgniteCache<Object, Object> cache = ignite1.jcache(null); + IgniteCache<Object, Object> cache = ignite1.cache(null); // Populate cache and check that local store has all value. for (int i = 0; i < KEYS; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java index 47e5be8..a121392 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -79,11 +79,11 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - g.jcache(null).removeAll(); + g.cache(null).removeAll(); - assert g.jcache(null).localSize() == 0; + assert g.cache(null).localSize() == 0; - g.jcache(null).mxBean().clear(); + g.cache(null).mxBean().clear(); g.transactions().resetMetrics(); } @@ -96,7 +96,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract 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); } } @@ -108,10 +108,10 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - g.jcache(null).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(false); + g.cache(null).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(false); } - IgniteCache<Object, Object> jcache = grid(0).jcache(null); + IgniteCache<Object, Object> jcache = grid(0).cache(null); // Write to cache. for (int i = 0; i < KEY_CNT; i++) @@ -127,7 +127,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract // Assert that statistics is clear. for (int i = 0; i < gridCount(); i++) { - CacheMetrics m = grid(i).jcache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); assertEquals(m.getCacheGets(), 0); assertEquals(m.getCachePuts(), 0); @@ -146,7 +146,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testGetMetricsSnapshot() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); assertNotSame("Method metrics() should return snapshot.", cache.metrics(), cache.metrics()); } @@ -155,7 +155,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testGetAndRemoveAsyncAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); @@ -185,7 +185,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testRemoveAsyncValAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); Integer key = 0; @@ -215,7 +215,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testRemoveAvgTime() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(1, 1); cache.put(2, 2); @@ -237,7 +237,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testRemoveAllAvgTime() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(1, 1); cache.put(2, 2); @@ -261,7 +261,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testRemoveAllAsyncAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); Set<Integer> keys = new LinkedHashSet<>(); @@ -293,7 +293,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testGetAvgTime() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(1, 1); @@ -314,7 +314,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testGetAllAvgTime() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); assertEquals(0.0, cache.metrics().getAverageGetTime(), 0.0); @@ -338,7 +338,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testGetAllAsyncAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); assertEquals(0.0, cache.metrics().getAverageGetTime(), 0.0); @@ -369,7 +369,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutAvgTime() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); assertEquals(0.0, cache.metrics().getAveragePutTime(), 0.0); assertEquals(0, cache.metrics().getCachePuts()); @@ -391,7 +391,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutAsyncAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); assertEquals(0.0, cache.metrics().getAveragePutTime(), 0.0); @@ -410,7 +410,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testGetAndPutAsyncAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); Integer key = null; @@ -442,7 +442,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutIfAbsentAsyncAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); Integer key = null; @@ -472,7 +472,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testGetAndPutIfAbsentAsyncAvgTime() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); Integer key = null; @@ -502,7 +502,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutAllAvgTime() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); assertEquals(0.0, cache.metrics().getAveragePutTime(), 0.0); assertEquals(0, cache.metrics().getCachePuts()); @@ -525,7 +525,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutsReads() throws Exception { - IgniteCache<Integer, Integer> cache0 = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache0 = grid(0).cache(null); int keyCnt = keyCount(); @@ -544,7 +544,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract info("Puts: " + cache0.metrics().getCachePuts()); for (int j = 0; j < gridCount(); j++) { - IgniteCache<Integer, Integer> cache = grid(j).jcache(null); + IgniteCache<Integer, Integer> cache = grid(j).cache(null); int cacheWrites = (int)cache.metrics().getCachePuts(); @@ -563,7 +563,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract int misses = 0; for (int i = 0; i < gridCount(); i++) { - CacheMetrics m = grid(i).jcache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); puts += m.getCachePuts(); reads += m.getCacheGets(); @@ -583,7 +583,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMissHitPercentage() throws Exception { - IgniteCache<Integer, Integer> cache0 = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache0 = grid(0).cache(null); int keyCnt = keyCount(); @@ -594,7 +594,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract info("Puts: " + cache0.metrics().getCachePuts()); for (int j = 0; j < gridCount(); j++) { - IgniteCache<Integer, Integer> cache = grid(j).jcache(null); + IgniteCache<Integer, Integer> cache = grid(j).cache(null); long cacheWrites = cache.metrics().getCachePuts(); @@ -606,7 +606,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract // Check metrics for the whole cache. for (int i = 0; i < gridCount(); i++) { - CacheMetrics m = grid(i).jcache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); assertEquals(m.getCacheHits() * 100f / m.getCacheGets(), m.getCacheHitPercentage(), 0.1f); assertEquals(m.getCacheMisses() * 100f / m.getCacheGets(), m.getCacheMissPercentage(), 0.1f); @@ -617,7 +617,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMisses() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); int keyCnt = keyCount(); @@ -641,7 +641,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract long misses = 0; for (int i = 0; i < gridCount(); i++) { - CacheMetrics m = grid(i).jcache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); puts += m.getCachePuts(); reads += m.getCacheGets(); @@ -659,7 +659,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMissesOnEmptyCache() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); assertEquals("Expected 0 read", 0, cache.metrics().getCacheGets()); assertEquals("Expected 0 miss", 0, cache.metrics().getCacheMisses()); @@ -697,7 +697,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testRemoves() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); cache.put(1, 1); @@ -711,7 +711,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testManualEvictions() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == CacheMode.PARTITIONED) return; @@ -728,7 +728,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testTxEvictions() throws Exception { - if (grid(0).jcache(null).getConfiguration(CacheConfiguration.class).getAtomicityMode() != CacheAtomicityMode.ATOMIC) + if (grid(0).cache(null).getConfiguration(CacheConfiguration.class).getAtomicityMode() != CacheAtomicityMode.ATOMIC) checkTtl(true); } @@ -736,7 +736,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testNonTxEvictions() throws Exception { - if (grid(0).jcache(null).getConfiguration(CacheConfiguration.class).getAtomicityMode() == CacheAtomicityMode.ATOMIC) + if (grid(0).cache(null).getConfiguration(CacheConfiguration.class).getAtomicityMode() == CacheAtomicityMode.ATOMIC) checkTtl(false); } @@ -749,7 +749,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); - final IgniteCache<Integer, Integer> c = grid(0).jcache(null); + final IgniteCache<Integer, Integer> c = grid(0).cache(null); final Integer key = primaryKeys(jcache(0), 1, 0).get(0); @@ -774,7 +774,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract Transaction tx = grid(0).transactions().txStart(); try { - grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 1); + grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1); } finally { tx.rollback(); @@ -790,7 +790,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract Transaction tx = inTx ? grid(0).transactions().txStart() : null; try { - grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 1); + grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1); } finally { if (tx != null) @@ -822,7 +822,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract tx = inTx ? grid(0).transactions().txStart() : null; try { - grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 2); + grid(0).cache(null).withExpiryPolicy(expiry).put(key, 2); } finally { if (tx != null) @@ -852,7 +852,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract tx = inTx ? grid(0).transactions().txStart() : null; try { - grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 3); + grid(0).cache(null).withExpiryPolicy(expiry).put(key, 3); } finally { if (tx != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 31c3c41..c4881a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -109,7 +109,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra * @throws Exception If failed. */ public void testPutAndRemove() throws Exception { - final IgniteCache<Integer, Integer> sndCache0 = grid(0).jcache(null); + final IgniteCache<Integer, Integer> sndCache0 = grid(0).cache(null); final AtomicBoolean stop = new AtomicBoolean(); @@ -288,7 +288,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra for (int i = 0; i < GRID_CNT; i++) { Ignite ignite = grid(i); - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); for (Map.Entry<Integer, GridTuple<Integer>> expVal : expVals.entrySet()) { Integer val = cache.get(expVal.getKey()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index 3aabe63..a680423 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -396,7 +396,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked"}) @Override protected IgniteCache<String, Integer> jcache(int idx) { - return ignite(idx).jcache(null); + return ignite(idx).cache(null); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java index b28b268..639ecca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java @@ -101,7 +101,7 @@ public abstract class GridCacheAbstractUsersAffinityMapperSelfTest extends GridC * @throws Exception If failed. */ public void testAffinityMapper() throws Exception { - IgniteCache<Object, Object> cache = startGrid(0).jcache(null); + IgniteCache<Object, Object> cache = startGrid(0).cache(null); for (int i = 0; i < KEY_CNT; i++) { cache.put(String.valueOf(i), String.valueOf(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java index fc43dcc..28b427f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java @@ -104,9 +104,9 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { assert G.allGrids().size() == GRID_CNT; for (int i = 0; i < KEY_CNT; i++) { - grid(0).jcache(null).put(i, i); + grid(0).cache(null).put(i, i); - grid(0).jcache(NON_DFLT_CACHE_NAME).put(i, i); + grid(0).cache(NON_DFLT_CACHE_NAME).put(i, i); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java index ac71c6b..16d07d8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java @@ -124,7 +124,7 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest startGrids(4); - ignite(0).jcache(null); + ignite(0).cache(null); try { awaitPartitionMapExchange(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java index c1d7f94..74b95e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.util.typedef.*; @@ -82,7 +81,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception If test failed. */ public void testBasicLock() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); Lock lock = cache.lock(1); @@ -99,7 +98,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws IgniteCheckedException If test failed. */ public void testSingleLockReentry() throws IgniteCheckedException { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); Lock lock = cache.lock(1); @@ -127,7 +126,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception If test failed. */ public void testReentry() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); Lock lock = cache.lock(1); @@ -166,7 +165,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * */ public void testInterruptLock() throws InterruptedException { - final IgniteCache<Integer, String> cache = ignite.jcache(null); + final IgniteCache<Integer, String> cache = ignite.cache(null); final Lock lock = cache.lock(1); @@ -210,12 +209,12 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * */ public void testInterruptLockWithTimeout() throws Exception { - final IgniteCache<Integer, String> cache = ignite.jcache(null); + final IgniteCache<Integer, String> cache = ignite.cache(null); startGrid(1); try { - final List<Integer> keys = primaryKeys(grid(1).jcache(null), 2, 1); + final List<Integer> keys = primaryKeys(grid(1).cache(null), 2, 1); Lock lock1 = cache.lock(keys.get(1)); @@ -255,8 +254,8 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe assertFalse(cache.isLocalLocked(keys.get(0), false)); assertFalse(cache.isLocalLocked(keys.get(1), false)); - assertFalse(grid(1).jcache(null).isLocalLocked(keys.get(0), false)); - assertFalse(grid(1).jcache(null).isLocalLocked(keys.get(1), false)); + assertFalse(grid(1).cache(null).isLocalLocked(keys.get(0), false)); + assertFalse(grid(1).cache(null).isLocalLocked(keys.get(1), false)); assertTrue(isOk.get()); } @@ -269,7 +268,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws IgniteCheckedException If test failed. */ public void testManyLockReentries() throws IgniteCheckedException { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); Integer key = 1; @@ -312,7 +311,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception If test failed. */ public void testLockMultithreaded() throws Exception { - final IgniteCache<Integer, String> cache = ignite.jcache(null); + final IgniteCache<Integer, String> cache = ignite.cache(null); final CountDownLatch l1 = new CountDownLatch(1); final CountDownLatch l2 = new CountDownLatch(1); @@ -430,7 +429,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception If error occur. */ public void testBasicOps() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); CountDownLatch latch = new CountDownLatch(1); @@ -491,7 +490,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception If error occur. */ public void testBasicOpsWithReentry() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); int key = (int)System.currentTimeMillis(); @@ -563,7 +562,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception If test failed. */ public void testMultiLocks() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); Collection<Integer> keys = Arrays.asList(1, 2, 3); @@ -594,7 +593,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws IgniteCheckedException If test failed. */ public void testGetPutRemove() throws IgniteCheckedException { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); int key = (int)System.currentTimeMillis(); @@ -618,7 +617,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception In case of error. */ public void testPutWithExpiration() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); CacheEventListener lsnr = new CacheEventListener(new CountDownLatch(1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java index cf7557c..353f4e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java @@ -149,30 +149,30 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { public void performTest() throws Exception { // Put values into normal replicated cache. for (int i = 0; i < KEY_CNT; i++) - grid(0).jcache(CACHE_NAME).put(i, "val" + i); + grid(0).cache(CACHE_NAME).put(i, "val" + i); // Put values into a cache with another name. for (int i = 0; i < KEY_CNT_OTHER; i++) - grid(GRID_CNT - 1).jcache(CACHE_NAME_OTHER).put(i, "val" + i); + grid(GRID_CNT - 1).cache(CACHE_NAME_OTHER).put(i, "val" + i); // Check cache sizes. for (int i = 0; i < GRID_CNT - 1; i++) { - IgniteCache<Object, Object> cache = grid(i).jcache(CACHE_NAME); + IgniteCache<Object, Object> cache = grid(i).cache(CACHE_NAME); assertEquals("Key set [i=" + i + ']', KEY_CNT, cache.localSize()); } - assert grid(GRID_CNT - 1).jcache(CACHE_NAME_OTHER).localSize() == KEY_CNT_OTHER; + assert grid(GRID_CNT - 1).cache(CACHE_NAME_OTHER).localSize() == KEY_CNT_OTHER; // Perform clear. - grid(0).jcache(CACHE_NAME).clear(); + grid(0).cache(CACHE_NAME).clear(); // Expect caches with the given name to be clear on all nodes. for (int i = 0; i < GRID_CNT - 1; i++) - assert grid(i).jcache(CACHE_NAME).localSize() == 0; + assert grid(i).cache(CACHE_NAME).localSize() == 0; // ... but cache with another name should remain untouched. - assert grid(GRID_CNT - 1).jcache(CACHE_NAME_OTHER).localSize() == KEY_CNT_OTHER; + assert grid(GRID_CNT - 1).cache(CACHE_NAME_OTHER).localSize() == KEY_CNT_OTHER; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java index 282529b..ce3ff4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java @@ -152,7 +152,7 @@ public class GridCacheClearLocallySelfTest extends GridCommonAbstractTest { } if (i == 2) - ignite.jcache(CACHE_PARTITIONED); + ignite.cache(CACHE_PARTITIONED); cachesLoc[i] = ((IgniteKernal)ignite).getCache(CACHE_LOCAL); cachesPartitioned[i] = ((IgniteKernal)ignite).getCache(CACHE_PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java index b889a64..7476fea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java @@ -75,7 +75,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRehash() throws Exception { - IgniteCache<Integer, String> c = grid().jcache(null); + IgniteCache<Integer, String> c = grid().cache(null); int cnt = 100 * 1024; @@ -106,7 +106,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRehashRandom() throws Exception { - IgniteCache<Integer, String> c = grid().jcache(null); + IgniteCache<Integer, String> c = grid().cache(null); int cnt = 100 * 1024; @@ -154,7 +154,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { multithreaded(new Callable<Object>() { @SuppressWarnings("UnusedAssignment") @Override public Object call() throws Exception { - IgniteCache<Integer, String> c = grid().jcache(null); + IgniteCache<Integer, String> c = grid().cache(null); int tid = tidGen.getAndIncrement(); @@ -234,7 +234,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { multithreaded(new Callable<Object>() { @SuppressWarnings("UnusedAssignment") @Override public Object call() throws Exception { - IgniteCache<Integer, String> c = grid().jcache(null); + IgniteCache<Integer, String> c = grid().cache(null); int tid = tidGen.getAndIncrement(); @@ -321,7 +321,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("ResultOfObjectAllocationIgnored") public void testEmptyWeakIterator() throws Exception { - final IgniteCache<Integer, String> c = grid().jcache(null); + final IgniteCache<Integer, String> c = grid().cache(null); for (int i = 0; i < 10; i++) { multithreaded(new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java index e04973e..06e826d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java @@ -64,14 +64,14 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).jcache(null).removeAll(); + grid(0).cache(null).removeAll(); } /** * @throws Exception If failed. */ public void testRandomEntry() throws Exception { - IgniteCache<String, String> cache = grid(0).jcache(null); + IgniteCache<String, String> cache = grid(0).cache(null); for (int i = 0; i < 500; i++) cache.put("key" + i, "val" + i); @@ -89,7 +89,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRandomEntryMultiThreaded() throws Exception { - final IgniteCache<String, String> cache = grid(0).jcache(null); + final IgniteCache<String, String> cache = grid(0).cache(null); final AtomicBoolean done = new AtomicBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index 1564e3d..3f94228 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -722,7 +722,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { private <T> Object get(String cacheKey, String terminalId) { Object key = new CacheAffinityKey<>(cacheKey, terminalId); - return (T) ignite.jcache(null).get(key); + return (T) ignite.cache(null).get(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index 9003bf4..992f040 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -186,7 +186,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = null; depMode = SHARED; - assert startGrid(1).jcache("myCache").getConfiguration(CacheConfiguration.class).getCacheMode() == CacheConfiguration.DFLT_CACHE_MODE; + assert startGrid(1).cache("myCache").getConfiguration(CacheConfiguration.class).getCacheMode() == CacheConfiguration.DFLT_CACHE_MODE; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java index 4707dce..ebac314 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java @@ -94,7 +94,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst startGrid(4); - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 30; i++) cache.put(i, i); @@ -125,7 +125,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst startGrid(4); - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 30; i++) { try (Transaction tx = ignite(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java index bf56659..7184a97 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java @@ -198,14 +198,14 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { stopGrid(GRID_NAME); for (int i = 0; i < 10; i++) { - if (g1.jcache(null).localSize() == 0 && g2.jcache(null).localSize() == 0) + if (g1.cache(null).localSize() == 0 && g2.cache(null).localSize() == 0) break; U.sleep(500); } - assertEquals(0, g1.jcache(null).localSize()); - assertEquals(0, g2.jcache(null).localSize()); + assertEquals(0, g1.cache(null).localSize()); + assertEquals(0, g2.cache(null).localSize()); startGrid(3); } @@ -247,11 +247,11 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { stopGrid(GRID_NAME); - assert g1.jcache(null).localSize() == 1; - assert g1.jcache(null).localSize() == 1; + assert g1.cache(null).localSize() == 1; + assert g1.cache(null).localSize() == 1; - assert g2.jcache(null).localSize() == 1; - assert g2.jcache(null).localSize() == 1; + assert g2.cache(null).localSize() == 1; + assert g2.cache(null).localSize() == 1; startGrid(3); } @@ -286,7 +286,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { info("Key: " + key); - IgniteCache<Object, Object> cache = g0.jcache(null); + IgniteCache<Object, Object> cache = g0.cache(null); assert cache != null; @@ -394,7 +394,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(0); - g.jcache(null).put(0, valCls.newInstance()); + g.cache(null).put(0, valCls.newInstance()); info("Added value to cache 0."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index 9232393..625a429 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -138,7 +138,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { mode = LOCAL; try { - IgniteCache<Integer, Value> cache = startGrid().jcache(null); + IgniteCache<Integer, Value> cache = startGrid().cache(null); cache.put(1, new Value(new byte[1024])); cache.put(2, new Value(new byte[2048])); @@ -162,7 +162,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { mode = REPLICATED; try { - IgniteCache<Integer, Value> cache = startGrid().jcache(null); + IgniteCache<Integer, Value> cache = startGrid().cache(null); cache.put(1, new Value(new byte[1024])); cache.put(2, new Value(new byte[2048])); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java index efc0ee1..838ba83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java @@ -100,7 +100,7 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest { F.viewReadOnly(grid(0).affinity(null).mapKeyToPrimaryAndBackups(key), F.node2id()) + ']'); } - grid(0).jcache(null).putAll(map); + grid(0).cache(null).putAll(map); for (int g = 0; g < 3; g++) { IgniteKernal grid = (IgniteKernal)grid(g); @@ -127,7 +127,7 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest { startGrid(3); - grid(0).jcache(null).putAll(map); + grid(0).cache(null).putAll(map); for (int g = 0; g < 4; g++) { IgniteKernal grid = (IgniteKernal)grid(g); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java index 39988cd..46a28dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java @@ -101,7 +101,7 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr } }, EventType.EVT_CACHE_ENTRY_EVICTED); - IgniteCache<String, String> c = g.jcache(null); + IgniteCache<String, String> c = g.cache(null); c.put("1", "val1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java index 027a48f..82634be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java @@ -83,7 +83,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest String key = "key"; String val = "value"; - IgniteCache<String, String> cache = grid.jcache(null); + IgniteCache<String, String> cache = grid.cache(null); int keyPart = grid.<String, String>internalCache().context().affinity().partition(key); @@ -126,7 +126,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest if (barrier.await() == 0) start.set(System.currentTimeMillis()); - IgniteCache<String, String> cache = grid(0).jcache(null); + IgniteCache<String, String> cache = grid(0).cache(null); Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ); @@ -188,7 +188,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest * @throws Exception If failed. */ public void testMvccFinishKeys() throws Exception { - IgniteCache<String, Integer> cache = grid(0).jcache(null); + IgniteCache<String, Integer> cache = grid(0).cache(null); try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { final String key = "key"; @@ -226,7 +226,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest final CountDownLatch latch = new CountDownLatch(1); - IgniteCache<Integer, String> cache = grid.jcache(null); + IgniteCache<Integer, String> cache = grid.cache(null); Lock lock = cache.lock(key); @@ -284,7 +284,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest final CountDownLatch latch = new CountDownLatch(1); - IgniteCache<String, String> cache = grid.jcache(null); + IgniteCache<String, String> cache = grid.cache(null); Lock lock = cache.lock(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java index 0680454..418c95a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java @@ -168,7 +168,7 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest { ignite = restarts ? grids.getAndSet(idx, null) : grid(idx); } - IgniteCache<String, TestObject> cache = ignite.jcache(null); + IgniteCache<String, TestObject> cache = ignite.cache(null); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index 5b0f6b8..d191c56 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.cache.CacheMode.*; public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbstractSelfTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - + /** */ private static Interceptor interceptor; @@ -81,9 +81,9 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst IgniteConfiguration c = super.getConfiguration(gridName); TcpDiscoverySpi spi = new TcpDiscoverySpi(); - + spi.setIpFinder(IP_FINDER); - + c.setDiscoverySpi(spi); c.getTransactionConfiguration().setTxSerializableEnabled(true); @@ -1341,7 +1341,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst try { for (int i = 0; i < gridCount(); i++) - assertEquals("Unexpected value for grid " + i, expVal, grid(i).jcache(null).get(key)); + assertEquals("Unexpected value for grid " + i, expVal, grid(i).cache(null).get(key)); } finally { interceptor.disabled = false; @@ -1503,9 +1503,9 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst IgniteBiTuple t = beforePutMap.put(entry.getKey(), new IgniteBiTuple(entry.getValue(), newVal)); if (t != null) { - assertEquals("Interceptor called with different old values for key " + entry.getKey(), t.get1(), + assertEquals("Interceptor called with different old values for key " + entry.getKey(), t.get1(), entry.getValue()); - assertEquals("Interceptor called with different new values for key " + entry.getKey(), t.get2(), + assertEquals("Interceptor called with different new values for key " + entry.getKey(), t.get2(), newVal); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java index c74e36c..3bb5549 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java @@ -106,7 +106,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSmall() throws Exception { - IgniteCache<Integer, Integer> cache = grid().jcache(null); + IgniteCache<Integer, Integer> cache = grid().cache(null); for (int i = 0; i < SMALL_ENTRY_CNT; i++) cache.put(i, i); @@ -135,7 +135,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLarge() throws Exception { - IgniteCache<Integer, Integer> cache = grid().jcache(null); + IgniteCache<Integer, Integer> cache = grid().cache(null); for (int i = 0; i < LARGE_ENTRY_CNT; i++) cache.put(i, i); @@ -164,7 +164,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testFiltered() throws Exception { - IgniteCache<Integer, Integer> cache = grid().jcache(null); + IgniteCache<Integer, Integer> cache = grid().cache(null); for (int i = 0; i < LARGE_ENTRY_CNT; i++) cache.put(i, i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java index a928ea3..2e86c29 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java @@ -127,7 +127,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { this.atomicityMode = atomicityMode; try { - IgniteCache<IncorrectCacheKey, String> cache = grid(0).jcache(null); + IgniteCache<IncorrectCacheKey, String> cache = grid(0).cache(null); cache.get(new IncorrectCacheKey(0)); @@ -147,7 +147,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { this.atomicityMode = atomicityMode; try { - IgniteCache<IncorrectCacheKey, String> cache = grid(0).jcache(null); + IgniteCache<IncorrectCacheKey, String> cache = grid(0).cache(null); cache.put(new IncorrectCacheKey(0), "test_value"); @@ -167,7 +167,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { this.atomicityMode = atomicityMode; try { - IgniteCache<IncorrectCacheKey, String> cache = grid(0).jcache(null); + IgniteCache<IncorrectCacheKey, String> cache = grid(0).cache(null); cache.remove(new IncorrectCacheKey(0)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java index a03798e..c7af84e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java @@ -107,7 +107,7 @@ public class GridCacheLeakTest extends GridCommonAbstractTest { try { int i = 0; - IgniteCache<Object, Object> cache = grid(0).jcache(CACHE_NAME); + IgniteCache<Object, Object> cache = grid(0).cache(CACHE_NAME); while (!Thread.currentThread().isInterrupted()) { UUID key = UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java index 61845e5..ada20e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java @@ -93,7 +93,7 @@ public abstract class GridCacheMarshallerTxAbstractTest extends GridCommonAbstra Transaction tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ); try { - grid().jcache(null).put(key, value); + grid().cache(null).put(key, value); tx.commit(); } @@ -104,11 +104,11 @@ public abstract class GridCacheMarshallerTxAbstractTest extends GridCommonAbstra tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ); try { - assert value.equals(grid().jcache(null).get(key)); + assert value.equals(grid().cache(null).get(key)); - grid().jcache(null).put(key, newValue); + grid().cache(null).put(key, newValue); - grid().jcache(null).put(key2, wrongValue); + grid().cache(null).put(key2, wrongValue); tx.commit(); } @@ -119,7 +119,7 @@ public abstract class GridCacheMarshallerTxAbstractTest extends GridCommonAbstra tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ); try { - String locVal = (String)grid().jcache(null).get(key); + String locVal = (String)grid().cache(null).get(key); assert locVal != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java index debfce6..a7e51b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java @@ -111,7 +111,7 @@ public class GridCacheMarshallingNodeJoinSelfTest extends GridCommonAbstractTest }, 1); try (Transaction tx = ignite(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - IgniteCache<Integer, TestObject> cache = ignite(0).jcache(null); + IgniteCache<Integer, TestObject> cache = ignite(0).cache(null); cache.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/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java index babe45c..dc696d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -176,7 +176,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); - CacheConfiguration cfg = g.jcache(null).getConfiguration(CacheConfiguration.class); + CacheConfiguration cfg = g.cache(null).getConfiguration(CacheConfiguration.class); assertEquals(memoryMode, cfg.getMemoryMode()); assertEquals(0, cfg.getOffHeapMaxMemory()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java index f00222d..0f14f9a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java @@ -96,7 +96,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT int key = rnd.nextInt(keys); - IgniteCache<Integer, Integer> prj = grid(g).jcache(null); + IgniteCache<Integer, Integer> prj = grid(g).cache(null); try { try (Transaction tx = grid(g).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index d360df5..1a77981 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -131,7 +131,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { started.set(true); - IgniteCache<Object, Object> c = g4.jcache(null); + IgniteCache<Object, Object> c = g4.cache(null); info(">>>> Checking tx in new grid."); @@ -152,7 +152,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { assertFalse(started.get()); // Check we can proceed with transactions. - IgniteCache<Object, Object> cache0 = g.jcache(null); + IgniteCache<Object, Object> cache0 = g.cache(null); info(">>>> Checking tx commit."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java index 3397c1c..ddf42e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAbstractSelfTest.java @@ -66,7 +66,7 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache * @throws Exception If failed. */ public void testInvoke() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); final Integer key = primaryKey(cache); @@ -86,7 +86,7 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache @Override public Void call() throws Exception { int idx = gridIdx.incrementAndGet() - 1; - final IgniteCache<Integer, Integer> cache = grid(idx).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(idx).cache(null); for (int i = 0; i < ITERATIONS_PER_THREAD && !failed; i++) cache.invoke(key, new IncProcessor()); @@ -100,7 +100,7 @@ public abstract class GridCacheMultinodeUpdateAbstractSelfTest extends GridCache expVal += ITERATIONS_PER_THREAD * THREADS; for (int j = 0; j < gridCount(); j++) { - Integer val = (Integer)grid(j).jcache(null).get(key); + Integer val = (Integer)grid(j).cache(null).get(key); assertEquals("Unexpected value for grid " + j, expVal, val); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java index 83166af..9a07056 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java @@ -95,7 +95,7 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGridsMultiThreaded(gridCnt); - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); Transaction tx = ignite.transactions().txStart(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java index 6e578e2..956b099 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -85,9 +85,9 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { super.afterTest(); for (int i = 0; i < GRID_CNT; i++) { - grid(i).jcache(null).removeAll(); + grid(i).cache(null).removeAll(); - assert grid(i).jcache(null).localSize() == 0; + assert grid(i).cache(null).localSize() == 0; } } @@ -105,7 +105,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTwoTx() throws Exception { - final IgniteCache<String, Integer> c = grid(0).jcache(null); + final IgniteCache<String, Integer> c = grid(0).cache(null); GridKernalContext ctx = ((IgniteKernal)grid(0)).context(); @@ -136,7 +136,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLockAndTx() throws Exception { - final IgniteCache<String, Integer> c = grid(0).jcache(null); + final IgniteCache<String, Integer> c = grid(0).cache(null); Collection<Thread> threads = new LinkedList<>(); @@ -212,9 +212,9 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLockAndTx1() throws Exception { - final IgniteCache<String, Integer> c = grid(0).jcache(null); + final IgniteCache<String, Integer> c = grid(0).cache(null); - final IgniteCache<Integer, Integer> c1 = grid(0).jcache(null); + final IgniteCache<Integer, Integer> c1 = grid(0).cache(null); Collection<Thread> threads = new LinkedList<>();
