http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index 071d6ce..6dae4d4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -83,8 +83,8 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte @Override protected void beforeTestsStarted() throws Exception { ignite = startGrid(1); - cache = ignite.jcache(CACHE_REGULAR); - cacheOffheap = ignite.jcache(CACHE_OFFHEAP); + cache = ignite.cache(CACHE_REGULAR); + cacheOffheap = ignite.cache(CACHE_OFFHEAP); } /** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java index b34a150..9458e10 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import javax.cache.*; -import javax.cache.configuration.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; @@ -51,7 +50,7 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest { assert ignite != null; - ignite.jcache("test-cache").getAll(Collections.singleton(1)); + ignite.cache("test-cache").getAll(Collections.singleton(1)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java index c4bb0a1..83d1d89 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java @@ -78,7 +78,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If test failed. */ public void testLockReentry() throws IgniteCheckedException { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); assert !cache.isLocalLocked(1, false); assert !cache.isLocalLocked(1, true); @@ -123,7 +123,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { * @throws Exception If test failed. */ public void testLock() throws Throwable { - final IgniteCache<Integer, String> cache = ignite.jcache(null); + final IgniteCache<Integer, String> cache = ignite.cache(null); final CountDownLatch latch1 = new CountDownLatch(1); final CountDownLatch latch2 = new CountDownLatch(1); @@ -241,7 +241,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { * @throws Exception If test failed. */ public void testLockAndPut() throws Throwable { - final IgniteCache<Integer, String> cache = ignite.jcache(null); + final IgniteCache<Integer, String> cache = ignite.cache(null); final CountDownLatch latch1 = 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/local/GridCacheLocalMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java index d20efb7..d3f8c6c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java @@ -50,7 +50,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest @Override protected void beforeTest() throws Exception { Ignite ignite = grid(); - cache = ignite.jcache(null); + cache = ignite.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/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index 6034288..cda5705 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -134,7 +134,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { Transaction tx = null; try { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); tx = ignite.transactions().txStart(concurrency, isolation, 50, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 18e8a93..86c1544 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -256,7 +256,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testAllEntries() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -322,7 +322,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testFilterException() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -348,7 +348,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testEntriesByFilter() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -417,7 +417,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLocalNodeOnly() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); if (((IgniteKernal)grid(0)).getCache(null).configuration().getCacheMode() != PARTITIONED) return; @@ -492,7 +492,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (((IgniteKernal)grid(0)).getCache(null).configuration().getCacheMode() != PARTITIONED) return; - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -574,7 +574,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testTimeInterval() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() != PARTITIONED) return; @@ -654,7 +654,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testInitialQuery() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -699,7 +699,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testInitialQueryAndUpdates() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -761,7 +761,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLoadCache() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -797,7 +797,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (atomicityMode() == ATOMIC) return; - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); ContinuousQuery<Object, Object> qry = new ContinuousQuery<>(); @@ -833,7 +833,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testNodeJoin() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -872,7 +872,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo */ @SuppressWarnings("TryFinallyCanBeTryWithResources") public void testNodeJoinWithoutCache() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -961,7 +961,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo grid(i).events().localListen(execLsnr, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java index 834a9b7..03fac4f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java @@ -48,8 +48,8 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu * @throws Exception If failed. */ public void testRemoteNodeCallback() throws Exception { - IgniteCache<Integer, Integer> cache1 = grid(0).jcache(null); - IgniteCache<Integer, Integer> cache2 = grid(1).jcache(null); + IgniteCache<Integer, Integer> cache1 = grid(0).cache(null); + IgniteCache<Integer, Integer> cache2 = grid(1).cache(null); ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); @@ -88,8 +88,8 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu */ public void testCrossCallback() throws Exception { // Prepare. - IgniteCache<Integer, Integer> cache1 = grid(0).jcache(null); - IgniteCache<Integer, Integer> cache2 = grid(1).jcache(null); + IgniteCache<Integer, Integer> cache1 = grid(0).cache(null); + IgniteCache<Integer, Integer> cache2 = grid(1).cache(null); final int key1 = primaryKey(cache1); final int key2 = primaryKey(cache2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java index 5aef0f6..df9f201 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java @@ -297,7 +297,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { awaitPartitionMapExchange(); - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) cache.put(i, -1); @@ -682,7 +682,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { try { Ignite g = startGrid(); - final IgniteCache<Integer, Integer> c = g.jcache(null); + final IgniteCache<Integer, Integer> c = g.cache(null); final IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null); @@ -734,7 +734,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { try { Ignite g = startGrid(); - IgniteCache<Integer, Integer> c = g.jcache(null); + IgniteCache<Integer, Integer> c = g.cache(null); IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null); @@ -779,7 +779,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_PUT); - IgniteCache<Integer, Integer> c = g.jcache(null); + IgniteCache<Integer, Integer> c = g.cache(null); assertTrue(c.localSize() == 0); @@ -858,7 +858,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { ldr.removeData(i); } - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); for (int i = 0; i < 1000; i++) { assertNull(storeMap.get(i)); @@ -909,7 +909,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { ldr.addData(String.valueOf(i), new TestObject(i)); } - IgniteCache<String, TestObject> cache = ignite.jcache(null); + IgniteCache<String, TestObject> cache = ignite.cache(null); for (int i = 0; i < 100; i++) { TestObject val = cache.get(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/datastreamer/DataStreamerImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java index 98737a1..00f93d4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java @@ -138,7 +138,7 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest { Random rnd = new Random(); - IgniteCache<Integer, String> c = g0.jcache(null); + IgniteCache<Integer, String> c = g0.cache(null); for (int i = 0; i < KEYS_COUNT; i ++) { Integer k = rnd.nextInt(KEYS_COUNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java index 1a0c5bf..39d2f10 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java @@ -125,7 +125,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest { GridTestUtils.assertThrows(log(), new Callable<Object>() { @Override public Object call() throws Exception { - g.jcache(META_CACHE_NAME); + g.cache(META_CACHE_NAME); return null; } @@ -133,12 +133,12 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest { GridTestUtils.assertThrows(log(), new Callable<Object>() { @Override public Object call() throws Exception { - g.jcache(DATA_CACHE_NAME); + g.cache(DATA_CACHE_NAME); return null; } }, IllegalStateException.class, null); - assert g.jcache(CACHE_NAME) != null; + assert g.cache(CACHE_NAME) != null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index 1e2ae2a..dd6639a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -316,7 +316,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs final Integer affKey = 1; // Store a cache key. - g.jcache(CACHE_NAME).put(affKey, affKey.toString()); + g.cache(CACHE_NAME).put(affKey, affKey.toString()); String name = "serviceAffinity"; @@ -633,7 +633,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs key = ctx.name(); - cache = ignite.jcache(CACHE_NAME); + cache = ignite.cache(CACHE_NAME); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java index a8bc502..77b2ea5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java @@ -87,7 +87,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA final Integer affKey = 1; // Store a cache key. - g.jcache(CACHE_NAME).put(affKey, affKey.toString()); + g.cache(CACHE_NAME).put(affKey, affKey.toString()); String name = "serviceAffinityUpdateTopology"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java index e4ec35d..ca477e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheLoadPopulationTask.java @@ -97,7 +97,7 @@ public class GridCacheLoadPopulationTask extends ComputeTaskSplitAdapter<Void, V g.log().info("Putting values to partitioned cache [nodeId=" + g.cluster().localNode().id() + ", mapSize=" + map.size() + ']'); - g.jcache(GridCacheMultiNodeLoadTest.CACHE_NAME).putAll(map); + g.cache(GridCacheMultiNodeLoadTest.CACHE_NAME).putAll(map); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java index 48a1171..53c4934 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java @@ -130,7 +130,7 @@ abstract class GridCacheAbstractLoadTest { final Ignite ignite = G.ignite(); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java index 1f05f2a..6a85b91 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; @@ -72,7 +71,7 @@ public class GridCacheBenchmark { X.println("threadCnt=" + THREADS); X.println("testWrite=" + testWrite); - final IgniteCache<Long, Long> cache = g.jcache(CACHE); + final IgniteCache<Long, Long> cache = g.cache(CACHE); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java index 20989f4..c534523 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java @@ -366,7 +366,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad final Ignite ignite = G.ignite(); - final IgniteCache<Integer, Integer> cache = ignite.jcache(null); + final IgniteCache<Integer, Integer> cache = ignite.cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java index a33715f..d6c9d34 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; @@ -100,7 +99,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest { private void memoryTest() { Ignite ignite = G.ignite(); - final IgniteCache<Integer, byte[]> cache = ignite.jcache(null); + final IgniteCache<Integer, byte[]> cache = ignite.cache(null); assert cache != null; @@ -150,7 +149,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest { if (LOAD) test.loadTest(test.writeClos, test.readClos); - G.ignite().jcache(null).clear(); + G.ignite().cache(null).clear(); System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java index 19dad7f..0d777e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; @@ -202,7 +201,7 @@ public class GridCacheSwapLoadTest { return GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() { - IgniteCache<Integer, Integer> cache = g.jcache(null); + IgniteCache<Integer, Integer> cache = g.cache(null); assert cache != null; @@ -234,7 +233,7 @@ public class GridCacheSwapLoadTest { @Nullable @Override public Object call() throws Exception { getRemoveStartedLatch.await(); - IgniteCache<Integer, Integer> cache = g.jcache(null); + IgniteCache<Integer, Integer> cache = g.cache(null); assert cache != null; @@ -268,7 +267,7 @@ public class GridCacheSwapLoadTest { @Nullable @Override public Object call() throws Exception { getRemoveStartedLatch.await(); - IgniteCache<Integer, Integer> cache = g.jcache(null); + IgniteCache<Integer, Integer> cache = g.cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java index 316af3a..d0df6be 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.capacity; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.*; import org.springframework.context.support.*; @@ -46,7 +45,7 @@ public class GridCapacityLoadTest { IgniteConfiguration cfg = (IgniteConfiguration)ctx.getBean("grid.cfg"); try (Ignite g = G.start(cfg)) { - IgniteCache<Integer, Integer> c = g.jcache(null); + IgniteCache<Integer, Integer> c = g.cache(null); long init = mem.getHeapMemoryUsage().getUsed(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java index 609bc87..a52a781 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java @@ -57,7 +57,7 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> { try { ExecutorCompletionService<Object> completeSvc = new ExecutorCompletionService<>(execSvc); - final IgniteCache<GridTestKey, Long> cache = ignite.jcache("partitioned"); + final IgniteCache<GridTestKey, Long> cache = ignite.cache("partitioned"); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java index a3ebc32..11e835b 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java @@ -32,7 +32,7 @@ public class GridTestLifecycleBean implements LifecycleBean { /** {@inheritDoc} */ @Override public void onLifecycleEvent(LifecycleEventType type) { if (type == LifecycleEventType.AFTER_NODE_START) { - IgniteCache<GridTestKey, Long> cache = g.jcache("partitioned"); + IgniteCache<GridTestKey, Long> cache = g.cache("partitioned"); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java index 08e2cf9..0da35ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java @@ -43,7 +43,7 @@ public class GridTestMain { // Initialize Spring factory. try (Ignite g = G.start((IgniteConfiguration)ctx.getBean("grid.cfg"))) { - final IgniteCache<GridTestKey, Long> cache = g.jcache("partitioned"); + final IgniteCache<GridTestKey, Long> cache = g.cache("partitioned"); assert cache != null; @@ -71,7 +71,7 @@ public class GridTestMain { Ignite g = G.ignite(); - final IgniteCache<GridTestKey, Long> cache = g.jcache("partitioned"); + final IgniteCache<GridTestKey, Long> cache = g.cache("partitioned"); final BlockingQueue<IgniteFuture> q = new ArrayBlockingQueue<>(400); @@ -133,7 +133,7 @@ public class GridTestMain { long start = System.currentTimeMillis(); - final IgniteCache<GridTestKey, Long> cache = G.ignite().jcache("partitioned"); + final IgniteCache<GridTestKey, Long> cache = G.ignite().cache("partitioned"); // Collocate computations and data. for (long i = 0; i < GridTestConstants.ENTRY_COUNT; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index f5ba069..3fa080d 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -78,7 +78,7 @@ public class GridContinuousOperationsLoadTest { dumpProperties(System.out); try (Ignite ignite = Ignition.start(cfgPath)) { - final IgniteCache<Object, Object> cache = ignite.jcache(cacheName); + final IgniteCache<Object, Object> cache = ignite.cache(cacheName); if (cache == null) throw new IgniteCheckedException("Cache is not configured: " + cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index b6779f8..dd25e95 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -108,7 +108,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe @Override public Boolean call() throws Exception { Ignite ignite = grid(); - IgniteCache cache = ignite.jcache(null); + IgniteCache cache = ignite.cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiClient.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiClient.java index 5518a6d..d72628c 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiClient.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiClient.java @@ -234,7 +234,7 @@ public class GridDsiClient implements Callable { // No 2 client should use the same simulator. HashMap<UUID, Collection<String>> terminals = (HashMap<UUID, Collection<String>>) - g.jcache("CLIENT_PARTITIONED_CACHE").get("terminals"); + g.cache("CLIENT_PARTITIONED_CACHE").get("terminals"); if (terminals == null) { X.println(">>> Terminals map has not been initialized."); @@ -279,7 +279,7 @@ public class GridDsiClient implements Callable { terminals.put(srvrId, list); } - g.jcache("CLIENT_PARTITIONED_CACHE").put("terminals", terminals); + g.cache("CLIENT_PARTITIONED_CACHE").put("terminals", terminals); } else { X.println(">>> Terminals map has been initialized."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java index 8b96181..dd9a3f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java @@ -222,7 +222,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { * */ private void doWork() { - IgniteCache cache = ignite.jcache(cacheName); + IgniteCache cache = ignite.cache(cacheName); assert cache != null; @@ -311,7 +311,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { * @param cacheKey Key. */ private void put(final Object o, Object cacheKey) { - IgniteCache<Object, Object> cache = ignite.jcache(cacheName); + IgniteCache<Object, Object> cache = ignite.cache(cacheName); assert cache != null; @@ -332,6 +332,6 @@ public class GridDsiPerfJob extends ComputeJobAdapter { */ @SuppressWarnings("ConstantConditions") private <T> Object get(Object key) { - return ignite.jcache(cacheName).get(key); + return ignite.cache(cacheName).get(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java index b53203a..1082fb4 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java @@ -50,7 +50,7 @@ public class GridBenchmarkCacheGetLoadTest { public static void main(String[] args) throws Exception { Ignition.start("modules/core/src/test/config/load/dsi-49-server-production.xml"); - IgniteCache<Long, Long> cache = Ignition.ignite("dsi").jcache("PARTITIONED_CACHE"); + IgniteCache<Long, Long> cache = Ignition.ignite("dsi").cache("PARTITIONED_CACHE"); stats(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java index afb287f..aac9400 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask1.java @@ -89,7 +89,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ X.println(">>> Received job for ID: " + jobId); - return g.jcache("replicated").localPeek(jobId, CachePeekMode.ONHEAP); + return g.cache("replicated").localPeek(jobId, CachePeekMode.ONHEAP); } }, n); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java index d5ee8b7..7582284 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperTask2.java @@ -51,7 +51,7 @@ public class GridContinuousMapperTask2 extends ComputeTaskAdapter<int[], Integer X.println(">>> Received job for ID: " + jobId); - return g.jcache("replicated").localPeek(jobId, CachePeekMode.ONHEAP); + return g.cache("replicated").localPeek(jobId, CachePeekMode.ONHEAP); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java index adc15ed..d484e30 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java @@ -83,7 +83,7 @@ public class GridSwapEvictAllBenchmark { }); try { - IgniteCache<Object, Object> cache = g.jcache(null); + IgniteCache<Object, Object> cache = g.cache(null); assert cache != null; @@ -152,7 +152,7 @@ public class GridSwapEvictAllBenchmark { long start = System.currentTimeMillis(); - IgniteCache<Object, Object> cache = G.ignite().jcache(null); + IgniteCache<Object, Object> cache = G.ignite().cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java index 3eb2909..a89479b 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java @@ -118,7 +118,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testDefaultCache() throws Exception { - IgniteCache<String, String> cache = grid().jcache(null); + IgniteCache<String, String> cache = grid().cache(null); cache.put("key", "val"); @@ -148,7 +148,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testNamedCache() throws Exception { - IgniteCache<String, String> cache = grid().jcache(CACHE_NAME); + IgniteCache<String, String> cache = grid().cache(CACHE_NAME); cache.put("key", "val"); @@ -667,7 +667,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest } }, EVTS_CACHE); - grid().jcache(null).put(1, 1); + grid().cache(null).put(1, 1); GridMarshallerTestBean inBean = newTestBean(evts); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java index ab215e1..a28996d 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java @@ -79,7 +79,7 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest cache = false; - IgniteCache<Integer, Object> cache0 = ignite(0).jcache(null); + IgniteCache<Integer, Object> cache0 = ignite(0).cache(null); for (int i = 0; i < 10; i++) { log.info("Iteration: " + i); @@ -108,7 +108,7 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest Ignite ignite = startGrid(2); // Check can start on more cache node. - assertNotNull(ignite.jcache(null)); + assertNotNull(ignite.cache(null)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java index 695df73..1d42d85 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java @@ -82,8 +82,8 @@ public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testSecondCachePutRemove() throws Exception { - IgniteCache<Integer, Integer> data = grid().jcache(DATA_CACHE); - IgniteCache<Integer, String> cp = grid().jcache(CP_CACHE); + IgniteCache<Integer, Integer> data = grid().cache(DATA_CACHE); + IgniteCache<Integer, String> cp = grid().cache(CP_CACHE); data.put(1, 1); cp.put(1, "1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index 6150cb0..bdfeeff 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -114,8 +114,8 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { } // Now, grid1 is always primary node for key 1. - final IgniteCache<Integer, String> cache1 = ignite1.jcache(null); - final IgniteCache<Integer, String> cache2 = ignite2.jcache(null); + final IgniteCache<Integer, String> cache1 = ignite1.cache(null); + final IgniteCache<Integer, String> cache2 = ignite2.cache(null); info(">>> Primary: " + ignite1.cluster().localNode().id()); info(">>> Backup: " + ignite2.cluster().localNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index 9d4d365..295d385 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -161,7 +161,7 @@ public class IgniteMock implements Ignite { } /** {@inheritDoc} */ - @Override public <K, V> IgniteCache<K, V> jcache(@Nullable String name) { + @Override public <K, V> IgniteCache<K, V> cache(@Nullable String name) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index b70f376..9389018 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -76,7 +76,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected <K, V> IgniteCache<K, V> jcache(int idx) { - return grid(idx).jcache(null); + return grid(idx).cache(null); } /** @@ -130,7 +130,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected <K, V> IgniteCache<K, V> jcache() { - return grid().jcache(null); + return grid().cache(null); } /** @@ -548,7 +548,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { assertNotNull(node); - return grid((String)node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME)).jcache(cacheName); + return grid((String)node.attribute(IgniteNodeAttributes.ATTR_GRID_NAME)).cache(cacheName); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java index c9bdb72..a6db3eb 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java @@ -45,7 +45,7 @@ public class CacheDeploymentTestTask1 extends ComputeTaskAdapter<ClusterNode, Ob X.println("Executing CacheDeploymentTestTask1 job on node " + ignite.cluster().localNode().id()); - IgniteCache<String, CacheDeploymentTestValue> cache = ignite.jcache(null); + IgniteCache<String, CacheDeploymentTestValue> cache = ignite.cache(null); for (int i = 0; i < PUT_CNT; i++) cache.put("1" + i, new CacheDeploymentTestValue()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java index b87fdd2..635977a 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java @@ -44,7 +44,7 @@ public class CacheDeploymentTestTask3 extends ComputeTaskAdapter<T2<ClusterNode, X.println("Executing CacheDeploymentTestTask3 job on node " + ignite.cluster().localNode().id()); - ignite.<String, CacheDeploymentTestValue>jcache(null).put(val, + ignite.<String, CacheDeploymentTestValue>cache(null).put(val, new CacheDeploymentTestValue()); return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java index 23bd659..725274b 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java @@ -38,7 +38,7 @@ public class GridP2PContinuousDeploymentTask1 extends ComputeTaskSplitAdapter<Ob @Override public Object execute() { X.println(">>> Executing GridP2PContinuousDeploymentTask1 job."); - ignite.jcache(null).put("key", new TestUserResource()); + ignite.cache(null).put("key", new TestUserResource()); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java index dbc000b..45769dc 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java @@ -235,11 +235,11 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes ses.close(); } - IgniteCache<Object, Object> cache1 = grid(0).jcache("cache1"); - IgniteCache<Object, Object> cache2 = grid(0).jcache("cache2"); - IgniteCache<Object, Object> cache3 = grid(0).jcache("cache3"); - IgniteCache<Object, Object> cacheE3 = grid(0).jcache(ENTITY3_NAME); - IgniteCache<Object, Object> cacheE4 = grid(0).jcache(ENTITY4_NAME); + IgniteCache<Object, Object> cache1 = grid(0).cache("cache1"); + IgniteCache<Object, Object> cache2 = grid(0).cache("cache2"); + IgniteCache<Object, Object> cache3 = grid(0).cache("cache3"); + IgniteCache<Object, Object> cacheE3 = grid(0).cache(ENTITY3_NAME); + IgniteCache<Object, Object> cacheE4 = grid(0).cache(ENTITY4_NAME); assertEquals("Unexpected entries: " + toSet(cache1.iterator()), expCache1, cache1.size()); assertEquals("Unexpected entries: " + toSet(cache2.iterator()), expCache2, cache2.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 28c2306..50ca5b4 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -230,7 +230,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testApiQueries() throws Exception { - IgniteCache<Object,Object> c = ignite.jcache("partitioned"); + IgniteCache<Object,Object> c = ignite.cache("partitioned"); c.query(new SqlFieldsQuery("select cast(? as varchar) from FactPurchase").setArgs("aaa")).getAll(); @@ -246,7 +246,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { // } public void _testLoop() throws Exception { - final IgniteCache<Object,Object> c = ignite.jcache("partitioned"); + final IgniteCache<Object,Object> c = ignite.cache("partitioned"); X.println("___ GET READY"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index d5bbfc7..a1d0bca 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -168,7 +168,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { @Override protected void afterTest() throws Exception { grid(0).events().stopLocalListen(swapLsnr); - grid(0).jcache(null).removeAll(); + grid(0).cache(null).removeAll(); } /** Resets event counters. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java index ff9d975..940683f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java @@ -96,7 +96,7 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest { public void testPerformance() throws Exception { Random rnd = new GridRandom(); - final IgniteCache<Long,Person> c = ignite.jcache("offheap-cache"); + final IgniteCache<Long,Person> c = ignite.cache("offheap-cache"); X.println("___ PUT start"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index c855e92..19ed776 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -143,14 +143,14 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA startGrid(gridCount()); - IgniteCache<String, Organization> orgCache = grid(0).jcache(null); + IgniteCache<String, Organization> orgCache = grid(0).cache(null); assert orgCache != null; orgCache.put("o1", new Organization(1, "A")); orgCache.put("o2", new Organization(2, "B")); - IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).jcache(null); + IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; @@ -158,20 +158,20 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA personCache.put(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); personCache.put(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); - IgniteCache<String, String> strCache = grid(0).jcache(null); + IgniteCache<String, String> strCache = grid(0).cache(null); assert strCache != null; strCache.put("key", "val"); - IgniteCache<Integer, Integer> intCache = grid(0).jcache(null); + IgniteCache<Integer, Integer> intCache = grid(0).cache(null); assert intCache != null; for (int i = 0; i < 200; i++) intCache.put(i, i); - IgniteCache<Integer, Integer> namedCache = grid(0).jcache(CACHE); + IgniteCache<Integer, Integer> namedCache = grid(0).cache(CACHE); for (int i = 0; i < 200; i++) namedCache.put(i, i); @@ -195,7 +195,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testExecute() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null) + QueryCursor<List<?>> qry = grid(0).cache(null) .query(new SqlFieldsQuery("select _KEY, name, age from Person")); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -241,7 +241,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testExecuteWithArguments() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null) + QueryCursor<List<?>> qry = grid(0).cache(null) .query(new SqlFieldsQuery("select _KEY, name, age from Person where age > ?").setArgs(30)); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -282,7 +282,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testSelectAllJoined() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null) + QueryCursor<List<?>> qry = grid(0).cache(null) .query(new SqlFieldsQuery("select * from Person p, Organization o where p.orgId = o.id")); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -344,7 +344,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testEmptyResult() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null) + QueryCursor<List<?>> qry = grid(0).cache(null) .query(new SqlFieldsQuery("select name from Person where age = 0")); Collection<List<?>> res = qry.getAll(); @@ -355,7 +355,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testQueryString() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null).query(new SqlFieldsQuery("select * from String")); + QueryCursor<List<?>> qry = grid(0).cache(null).query(new SqlFieldsQuery("select * from String")); Collection<List<?>> res = qry.getAll(); @@ -372,7 +372,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testQueryIntegersWithJoin() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null).query(new SqlFieldsQuery( + QueryCursor<List<?>> qry = grid(0).cache(null).query(new SqlFieldsQuery( "select i._KEY, i._VAL, j._KEY, j._VAL from Integer i join Integer j where i._VAL >= 100")); Collection<List<?>> res = qry.getAll(); @@ -395,7 +395,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testPagination() throws Exception { // Query with page size 20. - QueryCursor<List<?>> qry = grid(0).jcache(null) + QueryCursor<List<?>> qry = grid(0).cache(null) .query(new SqlFieldsQuery("select * from Integer").setPageSize(20)); List<List<?>> res = new ArrayList<>(qry.getAll()); @@ -416,7 +416,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testNamedCache() throws Exception { - IgniteCache<Integer, Integer> cache = grid(0).jcache(CACHE); + IgniteCache<Integer, Integer> cache = grid(0).cache(CACHE); for (int i = 0; i < 200; i++) cache.put(i, i); @@ -431,7 +431,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testNoPrimitives() throws Exception { - final IgniteCache<Object, Object> cache = grid(0).jcache(CACHE_NO_PRIMITIVES); + final IgniteCache<Object, Object> cache = grid(0).cache(CACHE_NO_PRIMITIVES); cache.put("key", "val"); @@ -444,7 +444,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testComplexKeys() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(CACHE_COMPLEX_KEYS); + IgniteCache<Object, Object> cache = grid(0).cache(CACHE_COMPLEX_KEYS); UUID id = UUID.randomUUID(); @@ -496,7 +496,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA * @throws Exception If failed. */ private void testPaginationIterator(@Nullable String cacheName) throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(cacheName) + QueryCursor<List<?>> qry = grid(0).cache(cacheName) .query(new SqlFieldsQuery("select _key, _val from Integer").setPageSize(10)); int cnt = 0; @@ -516,7 +516,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testPaginationIteratorKeepAll() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null) + QueryCursor<List<?>> qry = grid(0).cache(null) .query(new SqlFieldsQuery("select _key, _val from Integer").setPageSize(10)); int cnt = 0; @@ -533,7 +533,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA assertEquals(size, cnt); - qry = grid(0).jcache(null).query(new SqlFieldsQuery("select _key, _val from Integer").setPageSize(10)); + qry = grid(0).cache(null).query(new SqlFieldsQuery("select _key, _val from Integer").setPageSize(10)); List<List<?>> list = new ArrayList<>(qry.getAll()); @@ -568,7 +568,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA * @throws Exception If failed. */ private void testPaginationGet(@Nullable String cacheName) throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(cacheName) + QueryCursor<List<?>> qry = grid(0).cache(cacheName) .query(new SqlFieldsQuery("select _key, _val from Integer").setPageSize(10)); List<List<?>> list = new ArrayList<>(qry.getAll()); @@ -591,7 +591,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA /** @throws Exception If failed. */ public void testEmptyGrid() throws Exception { - QueryCursor<List<?>> qry = grid(0).jcache(null) + QueryCursor<List<?>> qry = grid(0).cache(null) .query(new SqlFieldsQuery("select name, age from Person where age = 25")); List<?> res = F.first(qry.getAll()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index 51acc1b..32c3ba2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -178,7 +178,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testDifferentKeyTypes() throws Exception { - final IgniteCache<Object, Object> cache = ignite.jcache(null); + final IgniteCache<Object, Object> cache = ignite.cache(null); cache.put(1, "value"); @@ -213,7 +213,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testStringType() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); cache.put(666, "test"); @@ -232,7 +232,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testIntegerType() throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); int key = 898; @@ -258,7 +258,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac */ public void testUserDefinedFunction() throws IgniteCheckedException { // Without alias. - final IgniteCache<Object, Object> cache = ignite.jcache(null); + final IgniteCache<Object, Object> cache = ignite.cache(null); QueryCursor<List<?>> qry = cache.query(new SqlFieldsQuery("select square(1), square(2)")); @@ -310,10 +310,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testExpiration() throws Exception { - ignite.jcache(null). + ignite.cache(null). withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, 1000))).put(7, 1); - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); List<Cache.Entry<Integer, Integer>> qry = cache.query(new SqlQuery<Integer, Integer>(Integer.class, "1=1")).getAll(); @@ -335,7 +335,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testIllegalBounds() throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); cache.put(1, 1); cache.put(2, 2); @@ -352,7 +352,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testComplexType() throws Exception { - IgniteCache<Key, GridCacheQueryTestValue> cache = ignite.jcache(null); + IgniteCache<Key, GridCacheQueryTestValue> cache = ignite.cache(null); GridCacheQueryTestValue val1 = new GridCacheQueryTestValue(); @@ -422,7 +422,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testSelectQuery() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); cache.put(10, "value"); @@ -441,7 +441,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testObjectQuery() throws Exception { - IgniteCache<Integer, ObjectValue> cache = ignite.jcache(null); + IgniteCache<Integer, ObjectValue> cache = ignite.cache(null); ObjectValue val = new ObjectValue("test", 0); @@ -479,7 +479,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testObjectQueryWithSwap() throws Exception { - IgniteCache<Integer, ObjectValue> cache = ignite.jcache(null); + IgniteCache<Integer, ObjectValue> cache = ignite.cache(null); boolean partitioned = cache.getConfiguration(CacheConfiguration.class).getCacheMode() == PARTITIONED; @@ -572,7 +572,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testFullTextSearch() throws Exception { - IgniteCache<Integer, ObjectValue> cache = ignite.jcache(null); + IgniteCache<Integer, ObjectValue> cache = ignite.cache(null); // Try to execute on empty cache first. QueryCursor<Cache.Entry<Integer, ObjectValue>> qry = @@ -619,7 +619,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testScanQuery() throws Exception { - IgniteCache<Integer, String> c1 = ignite.jcache(null); + IgniteCache<Integer, String> c1 = ignite.cache(null); c1.put(777, "value"); @@ -648,7 +648,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception In case of error. */ public void testTwoObjectsTextSearch() throws Exception { - IgniteCache<Object, Object> c = ignite.jcache(null); + IgniteCache<Object, Object> c = ignite.cache(null); c.put(1, new ObjectValue("ObjectValue str", 1)); c.put("key", new ObjectValueOther("ObjectValueOther str")); @@ -671,7 +671,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testEmptyObject() throws Exception { - IgniteCache<EmptyObject, EmptyObject> cache = ignite.jcache(null); + IgniteCache<EmptyObject, EmptyObject> cache = ignite.cache(null); cache.put(new EmptyObject(1), new EmptyObject(2)); @@ -687,7 +687,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testPrimitiveType() throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); cache.put(1, 1); cache.put(2, 2); @@ -724,7 +724,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ private void testPaginationIterator(@Nullable String cacheName) throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(cacheName); + IgniteCache<Integer, Integer> cache = ignite.cache(cacheName); for (int i = 0; i < 50; i++) cache.put(i, i); @@ -766,7 +766,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ private void testPaginationGet(@Nullable String cacheName) throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(cacheName); + IgniteCache<Integer, Integer> cache = ignite.cache(cacheName); for (int i = 0; i < 50; i++) cache.put(i, i); @@ -794,7 +794,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testScanFilters() throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 50; i++) cache.put(i, i); @@ -830,7 +830,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws IgniteCheckedException if failed. */ public void testBadHashObjectKey() throws IgniteCheckedException { - IgniteCache<BadHashKeyObject, Byte> cache = ignite.jcache(null); + IgniteCache<BadHashKeyObject, Byte> cache = ignite.cache(null); cache.put(new BadHashKeyObject("test_key1"), (byte)1); cache.put(new BadHashKeyObject("test_key0"), (byte)10); @@ -844,7 +844,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws IgniteCheckedException if failed. */ public void testTextIndexedKey() throws IgniteCheckedException { - IgniteCache<ObjectValue, Long> cache = ignite.jcache(null); + IgniteCache<ObjectValue, Long> cache = ignite.cache(null); cache.put(new ObjectValue("test_key1", 10), 19L); cache.put(new ObjectValue("test_key0", 11), 11005L); @@ -859,7 +859,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testOrderByOnly() throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 10; i++) cache.put(i, i); @@ -889,7 +889,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testLimitOnly() throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 10; i++) cache.put(i, i); @@ -917,7 +917,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testArray() throws Exception { - IgniteCache<Integer, ArrayObject> cache = ignite.jcache(null); + IgniteCache<Integer, ArrayObject> cache = ignite.cache(null); cache.put(1, new ArrayObject(new Long[]{1L, null, 3L})); cache.put(2, new ArrayObject(new Long[] {4L, 5L, 6L})); @@ -969,7 +969,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac }, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 20; i++) cache.put(i, i); @@ -1043,7 +1043,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac }, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 20; i++) cache.put(i, i); @@ -1119,7 +1119,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac }, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache<UUID, Person> cache = ignite.jcache(null); + IgniteCache<UUID, Person> cache = ignite.cache(null); UUID k1 = UUID.randomUUID(); UUID k2 = UUID.randomUUID(); @@ -1168,7 +1168,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac }, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache<UUID, Person> cache = ignite.jcache(null); + IgniteCache<UUID, Person> cache = ignite.cache(null); for (int i = 1; i <= 20; i++) cache.put(UUID.randomUUID(), new Person("Person " + i, i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java index 3dcf234..e5c1b06 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java @@ -75,7 +75,7 @@ public class IgniteCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testQuery() throws Exception { - Collection<Cache.Entry<Object, Object>> res = grid().jcache(null) + Collection<Cache.Entry<Object, Object>> res = grid().cache(null) .query(new SqlQuery("Integer", "from Integer")).getAll(); assert res != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java index e531820..b2b9e2e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java @@ -23,8 +23,6 @@ import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -106,7 +104,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) - grid(i).jcache(null).removeAll(); + grid(i).cache(null).removeAll(); } /** {@inheritDoc} */ @@ -133,7 +131,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon final Person p3 = new Person("Mike", 1800, "Bachelor"); final Person p4 = new Person("Bob", 1900, "Bachelor"); - final IgniteCache<UUID, Person> cache0 = grid(0).jcache(null); + final IgniteCache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2);
