http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index e0ae128..af3ea9d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -94,7 +94,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac idxSpi.forceFail(false); for (int key = 0; key < lastKey; key++) - grid(0).jcache(null).remove(key); + grid(0).cache(null).remove(key); } /** {@inheritDoc} */ @@ -291,7 +291,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); if (putBefore) { idxSpi.forceFail(false); @@ -314,7 +314,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) { for (Integer key : keys) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); } idxSpi.forceFail(true); @@ -389,12 +389,12 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Put key: " + key); - grid(0).jcache(null).put(key, 1); + grid(0).cache(null).put(key, 1); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); idxSpi.forceFail(true); @@ -402,7 +402,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).jcache(null).put(key, 2); + grid(0).cache(null).put(key, 2); return null; } @@ -422,12 +422,12 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Put key: " + key); - grid(0).jcache(null).put(key, 1); + grid(0).cache(null).put(key, 1); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); idxSpi.forceFail(true); @@ -435,7 +435,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac Throwable e = GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).<Integer, Integer>jcache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() { + grid(0).<Integer, Integer>cache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() { @Override public Void process(MutableEntry<Integer, Integer> e, Object... args) { e.setValue(2); @@ -470,13 +470,13 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Put data: " + m); - grid(0).jcache(null).putAll(m); + grid(0).cache(null).putAll(m); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) { for (Integer key : keys) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); } idxSpi.forceFail(true); @@ -490,7 +490,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).jcache(null).putAll(m); + grid(0).cache(null).putAll(m); return null; } @@ -511,12 +511,12 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Put key: " + key); - grid(0).jcache(null).put(key, 1); + grid(0).cache(null).put(key, 1); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); idxSpi.forceFail(true); @@ -524,7 +524,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).jcache(null).remove(key); + grid(0).cache(null).remove(key); return null; } @@ -541,7 +541,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @return Key. */ private Integer keyForNode(ClusterNode node, int type) { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == LOCAL) return ++lastKey;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 89baf7f..3d743e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -156,7 +156,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onItemNear(boolean putCntr, Ignite ignite, String itemKey, int retry) { - IgniteCache<String, Integer> cache = ignite.jcache(null); + IgniteCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID itemPrimaryId = primaryId(ignite, itemKey); @@ -207,7 +207,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onItemPrimary(boolean putCntr, Ignite ignite, String itemKey, int retry) { - IgniteCache<String, Integer> cache = ignite.jcache(null); + IgniteCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID itemPrimaryId = primaryId(ignite, itemKey); @@ -260,7 +260,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onRemoveItemQueried(boolean putCntr, Ignite ignite, int retry) throws IgniteCheckedException { - IgniteCache<String, Integer> cache = ignite.jcache(null); + IgniteCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY); @@ -350,7 +350,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onRemoveItemSimple(boolean putCntr, Ignite ignite, int retry) { - IgniteCache<String, Integer> cache = ignite.jcache(null); + IgniteCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY); @@ -492,7 +492,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - grid(0).jcache(null).put(CNTR_KEY, 0); + grid(0).cache(null).put(CNTR_KEY, 0); grid(0).compute().call(new PutOneEntryInTxJob()); } @@ -512,13 +512,13 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - grid(0).jcache(null).put(CNTR_KEY, 0); + grid(0).cache(null).put(CNTR_KEY, 0); grid(0).compute().call(new PutTwoEntriesInTxJob()); printCounter(); - assertEquals(GRID_CNT * RETRIES, grid(0).jcache(null).get(CNTR_KEY)); + assertEquals(GRID_CNT * RETRIES, grid(0).cache(null).get(CNTR_KEY)); } finally { stopAllGrids(); @@ -539,7 +539,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe try { // Initialize. - grid(0).jcache(null).put(CNTR_KEY, 0); + grid(0).cache(null).put(CNTR_KEY, 0); for (int i = 0; i < GRID_CNT; i++) { final int gridId = i; @@ -577,7 +577,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe Collection<Thread> threads = new LinkedList<>(); try { - grid(0).jcache(null).put(CNTR_KEY, 0); + grid(0).cache(null).put(CNTR_KEY, 0); for (int i = 0; i < GRID_CNT; i++) { final int gridId = i; @@ -597,7 +597,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe printCounter(); - assertEquals(GRID_CNT * RETRIES, grid(0).jcache(null).get(CNTR_KEY)); + assertEquals(GRID_CNT * RETRIES, grid(0).cache(null).get(CNTR_KEY)); } finally { stopAllGrids(); @@ -624,7 +624,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe for (int i = 0; i < RETRIES; i++) for (int j = 0; j < GRID_CNT; j++) - assertEquals(i, grid(j).jcache(null).get(String.valueOf(i))); + assertEquals(i, grid(j).cache(null).get(String.valueOf(i))); CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, " _val >= 0"); @@ -638,9 +638,9 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe for (int i = 0; i < GRID_CNT * RETRIES; i++) for (int ii = 0; ii < GRID_CNT; ii++) - assertEquals(null, grid(ii).jcache(null).get(Integer.toString(i))); + assertEquals(null, grid(ii).cache(null).get(Integer.toString(i))); - assertEquals(-GRID_CNT * RETRIES, grid(0).jcache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP)); + assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP)); } finally { stopAllGrids(); @@ -665,7 +665,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe for (int i = 0; i < RETRIES; i++) for (int j = 0; j < GRID_CNT; j++) - assertEquals(i, grid(j).jcache(null).get(Integer.toString(i))); + assertEquals(i, grid(j).cache(null).get(Integer.toString(i))); CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, " _val >= 0"); @@ -680,14 +680,14 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe // Check using cache. for (int i = 0; i < GRID_CNT * RETRIES; i++) for (int ii = 0; ii < GRID_CNT; ii++) - assertEquals(null, grid(ii).jcache(null).get(Integer.toString(i))); + assertEquals(null, grid(ii).cache(null).get(Integer.toString(i))); // Check using query. entries = qry.execute().get(); assertTrue(entries.isEmpty()); - assertEquals(-GRID_CNT * RETRIES, grid(0).jcache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP)); + assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP)); } finally { stopAllGrids(); @@ -717,11 +717,11 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe cache.put(String.valueOf(i), i); for (int j = 0; j < GRID_CNT; j++) - assertEquals(0, grid(j).jcache(null).get(RMVD_CNTR_KEY)); + assertEquals(0, grid(j).cache(null).get(RMVD_CNTR_KEY)); for (int i = 1; i <= RETRIES; i++) for (int j = 0; j < GRID_CNT; j++) - assertEquals(i, grid(j).jcache(null).get(String.valueOf(i))); + assertEquals(i, grid(j).cache(null).get(String.valueOf(i))); CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0"); @@ -783,9 +783,9 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe for (int i = 0; i < GRID_CNT * RETRIES; i++) for (int ii = 0; ii < GRID_CNT; ii++) assertEquals("Got invalid value from cache [gridIdx=" + ii + ", key=" + i + ']', - null, grid(ii).jcache(null).get(Integer.toString(i))); + null, grid(ii).cache(null).get(Integer.toString(i))); - assertEquals(-GRID_CNT * RETRIES, grid(0).jcache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP)); + assertEquals(-GRID_CNT * RETRIES, grid(0).cache(null).localPeek(RMVD_CNTR_KEY, CachePeekMode.ONHEAP)); } finally { stopAllGrids(); @@ -797,8 +797,8 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ private void printCounter() { info("***"); - info("*** Peeked counter: " + grid(0).jcache(null).localPeek(CNTR_KEY, CachePeekMode.ONHEAP)); - info("*** Got counter: " + grid(0).jcache(null).get(CNTR_KEY)); + info("*** Peeked counter: " + grid(0).cache(null).localPeek(CNTR_KEY, CachePeekMode.ONHEAP)); + info("*** Got counter: " + grid(0).cache(null).get(CNTR_KEY)); info("***"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index 9c9cf00..4caa4a6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -208,7 +208,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract */ // TODO: GG-8063, enabled when fixed. public void _testOptimisticSerializableConsistency() throws Exception { - final IgniteCache<Integer, Long> cache = grid(0).jcache(null); + final IgniteCache<Integer, Long> cache = grid(0).cache(null); final int THREADS = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java index 15011a0..de62955 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java @@ -37,7 +37,6 @@ import org.apache.ignite.transactions.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; import static org.apache.ignite.transactions.TransactionIsolation.*; @@ -99,7 +98,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract startGrids(gridCount()); try { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); // Find test key. int key = testKey(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index 6367a1a..0f2acda 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -292,7 +292,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); if (putBefore) { store.forceFail(false); @@ -315,7 +315,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) { for (Integer key : keys) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); } store.forceFail(true); @@ -387,7 +387,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb } for (int i = 0; i < gridCount(); i++) - assertEquals("Unexpected value for grid " + i, putBefore ? 1 : null, grid(i).jcache(null).get(key)); + assertEquals("Unexpected value for grid " + i, putBefore ? 1 : null, grid(i).cache(null).get(key)); } /** @@ -401,12 +401,12 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Put key: " + key); - grid(0).jcache(null).put(key, 1); + grid(0).cache(null).put(key, 1); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); store.forceFail(true); @@ -414,7 +414,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).jcache(null).put(key, 2); + grid(0).cache(null).put(key, 2); return null; } @@ -434,12 +434,12 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Put key: " + key); - grid(0).jcache(null).put(key, 1); + grid(0).cache(null).put(key, 1); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); store.forceFail(true); @@ -447,7 +447,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb Throwable e = GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).<Integer, Integer>jcache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() { + grid(0).<Integer, Integer>cache(null).invoke(key, new EntryProcessor<Integer, Integer, Void>() { @Override public Void process(MutableEntry<Integer, Integer> e, Object... args) { e.setValue(2); @@ -482,13 +482,13 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Put data: " + m); - grid(0).jcache(null).putAll(m); + grid(0).cache(null).putAll(m); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) { for (Integer key : keys) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); } store.forceFail(true); @@ -502,7 +502,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).jcache(null).putAll(m); + grid(0).cache(null).putAll(m); return null; } @@ -523,12 +523,12 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Put key: " + key); - grid(0).jcache(null).put(key, 1); + grid(0).cache(null).put(key, 1); } // Execute get from all nodes to create readers for near cache. for (int i = 0; i < gridCount(); i++) - grid(i).jcache(null).get(key); + grid(i).cache(null).get(key); store.forceFail(true); @@ -536,7 +536,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid(0).jcache(null).remove(key); + grid(0).cache(null).remove(key); return null; } @@ -553,7 +553,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @return Key. */ private Integer keyForNode(ClusterNode node, int type) { - IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + IgniteCache<Integer, Integer> cache = grid(0).cache(null); if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == LOCAL) return ++lastKey; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java index 5a520f2..321e7f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java @@ -66,7 +66,7 @@ public abstract class IgniteCacheAbstractExecutionContextTest extends IgniteCach Object val = testClassLdr.loadClass(TEST_VALUE).newInstance(); - IgniteCache<Object, Object> jcache = grid(0).jcache(null); + IgniteCache<Object, Object> jcache = grid(0).cache(null); for (int i = 0; i < ITER_CNT; i++) jcache.put(i, val); @@ -79,7 +79,7 @@ public abstract class IgniteCacheAbstractExecutionContextTest extends IgniteCach assertEquals(testClassLdr, jcache.get(i).getClass().getClassLoader()); else assertEquals(grid(idx).configuration().getClassLoader(), - grid(idx).jcache(null).get(i).getClass().getClassLoader()); + grid(idx).cache(null).get(i).getClass().getClassLoader()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java index 3415848..54e1e7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java @@ -901,7 +901,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig g.transactions().txStart(); - g.jcache(TRANSACTIONAL_CACHE_NAME).put(1, 1); + g.cache(TRANSACTIONAL_CACHE_NAME).put(1, 1); assert g.atomicLong(STRUCTURE_NAME, val, false).incrementAndGet() == val + 1; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java index b343320..0c923a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java @@ -361,7 +361,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends IgniteAtomics GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - grid().jcache(GridCacheUtils.ATOMICS_CACHE_NAME); + grid().cache(GridCacheUtils.ATOMICS_CACHE_NAME); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java index 319fad1..2c0d8d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java @@ -249,7 +249,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest extends IgniteAtomicsA IgniteAtomicLong atomic = ignite.atomicLong("atomic", 0, true); - IgniteCache<Object, Object> cache = ignite.jcache(TRANSACTIONAL_CACHE_NAME); + IgniteCache<Object, Object> cache = ignite.cache(TRANSACTIONAL_CACHE_NAME); try (Transaction tx = ignite.transactions().txStart()) { cache.put(1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java index d0661f7..4d30c0b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java @@ -157,14 +157,14 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac for (int i = INIT_GRID_NUM; i < MAX_GRID_NUM; i++) { startGrid(i); - assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); + assert PARTITIONED == grid(i).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); try (Transaction tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - Integer val = (Integer) grid(i).jcache(null).get(key); + Integer val = (Integer) grid(i).cache(null).get(key); assertEquals("Simple check failed for node: " + i, (Integer) i, val); - grid(i).jcache(null).put(key, i + 1); + grid(i).cache(null).put(key, i + 1); tx.commit(); } @@ -182,12 +182,12 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac for (int i = INIT_GRID_NUM; i < 20; i++) { startGrid(i); - assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); + assert PARTITIONED == grid(i).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); try (Transaction tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { GridCacheInternalKey key = new GridCacheInternalKeyImpl(name); - GridCacheAtomicLongValue atomicVal = ((GridCacheAtomicLongValue) grid(i).jcache(null).get(key)); + GridCacheAtomicLongValue atomicVal = ((GridCacheAtomicLongValue) grid(i).cache(null).get(key)); assertNotNull(atomicVal); @@ -195,7 +195,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac atomicVal.set(i + 1); - grid(i).jcache(null).put(key, atomicVal); + grid(i).cache(null).put(key, atomicVal); tx.commit(); } @@ -213,7 +213,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac for (int i = INIT_GRID_NUM; i < 20; i++) { startGrid(i); - assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); + assert PARTITIONED == grid(i).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); IgniteAtomicLong atomic = grid(i).atomicLong(name, 0, true); @@ -238,13 +238,13 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac assert startGrid(i) != null; for (int i = 0; i < INIT_GRID_NUM; i++) - assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); + assert PARTITIONED == grid(i).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); // Init cache data. try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // Put simple value. - grid(0).jcache(null).put(key, INIT_GRID_NUM); + grid(0).cache(null).put(key, INIT_GRID_NUM); tx.commit(); } @@ -261,13 +261,13 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac assert startGrid(i) != null; for (int i = 0; i < INIT_GRID_NUM; i++) - assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); + assert PARTITIONED == grid(i).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); // Init cache data. try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // Put custom data - grid(0).jcache(null).put(new GridCacheInternalKeyImpl(key), new GridCacheAtomicLongValue(INIT_GRID_NUM)); + grid(0).cache(null).put(new GridCacheInternalKeyImpl(key), new GridCacheAtomicLongValue(INIT_GRID_NUM)); tx.commit(); } @@ -286,7 +286,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac assert startGrid(i) != null; for (int i = 0; i < INIT_GRID_NUM; i++) - assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); + assert PARTITIONED == grid(i).cache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); // Init cache data. grid(0).atomicLong(key, 0, true).getAndSet(INIT_GRID_NUM); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 8a49b46..67dcb7a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -169,7 +169,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl // If output presents, test passes with greater probability. // info("Start puts."); - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); info("Partition: " + ignite.affinity(null).partition(1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index 196a892..f07a589 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -139,9 +139,9 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend for (int i = 0; i < gridCnt; i++) { ignites[i] = startGrid(i); - caches[i] = ignites[i].jcache(CACHE_REGULAR); - cachesOffheap[i] = ignites[i].jcache(CACHE_OFFHEAP); - cachesOffheapTiered[i] = ignites[i].jcache(CACHE_OFFHEAP_TIERED); + caches[i] = ignites[i].cache(CACHE_REGULAR); + cachesOffheap[i] = ignites[i].cache(CACHE_OFFHEAP); + cachesOffheapTiered[i] = ignites[i].cache(CACHE_OFFHEAP_TIERED); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index d2cef6e..0db5e95 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -77,12 +77,12 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).jcache(null).removeAll(); + grid(0).cache(null).removeAll(); for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); - IgniteCache<String, int[]> c = g.jcache(null); + IgniteCache<String, int[]> c = g.cache(null); GridCacheAdapter<Object, Object> cache = ((IgniteEx)g).context().cache().internalCache(); @@ -141,7 +141,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra private Ignite ignite; @Override public Void applyx(final Integer i) { - IgniteCache<String, int[]> cache = ignite.jcache(null); + IgniteCache<String, int[]> cache = ignite.cache(null); try (Transaction tx = ignite.transactions().txStart(concur, isolation)) { int[] arr = cache.get(key); @@ -177,10 +177,10 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra for (int g = 0; g < GRID_CNT; g++) { info("Will check grid: " + g); - info("Value: " + grid(i).jcache(null).localPeek(key)); + info("Value: " + grid(i).cache(null).localPeek(key)); } - IgniteCache<String, int[]> c = grid(i).jcache(null); + IgniteCache<String, int[]> c = grid(i).cache(null); // Do within transaction to make sure that lock is acquired // which means that all previous transactions have committed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 923fd72..f2352db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -163,7 +163,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs startGrids(); try { - IgniteCache<Integer, String> c = grid(idx).jcache(CACHE_NAME); + IgniteCache<Integer, String> c = grid(idx).cache(CACHE_NAME); for (int j = 0; j < retries; j++) { for (int i = 0; i < keyCnt; i++) @@ -181,7 +181,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs Ignite ignite = startGrid(idx); - c = ignite.jcache(CACHE_NAME); + c = ignite.cache(CACHE_NAME); checkGet(c, j); } @@ -496,7 +496,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs info("Starting put thread..."); - IgniteCache<Integer, String> cache = grid(gridIdx).jcache(CACHE_NAME); + IgniteCache<Integer, String> cache = grid(gridIdx).cache(CACHE_NAME); while (System.currentTimeMillis() < endTime && err.get() == null) { int key = RAND.nextInt(keyCnt); @@ -616,7 +616,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs UUID locNodeId = ignite.cluster().localNode().id(); - IgniteCache<Integer, String> cache = ignite.jcache(CACHE_NAME); + IgniteCache<Integer, String> cache = ignite.cache(CACHE_NAME); List<Integer> keys = new ArrayList<>(txKeys); @@ -774,7 +774,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs UUID locNodeId = ignite.cluster().localNode().id(); - IgniteCache<Integer, String> cache = ignite.jcache(CACHE_NAME); + IgniteCache<Integer, String> cache = ignite.cache(CACHE_NAME); List<Integer> keys = new ArrayList<>(txKeys); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index ed2efc9..5f3a68e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -89,7 +89,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs public void testPrimarySync() throws Exception { for (int i = 0; i < GRID_CNT; i++) { for (int j = 0; j < GRID_CNT; j++) { - IgniteCache<Integer, Integer> cache = grid(j).jcache(null); + IgniteCache<Integer, Integer> cache = grid(j).cache(null); if (grid(j).affinity(null).isPrimary(grid(j).localNode(), i)) { try (Transaction tx = grid(j).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/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index fe95706..89e38f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -113,7 +113,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { TestCommunicationSpi commSpi = (TestCommunicationSpi)grid(0).configuration().getCommunicationSpi(); - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); int key = keyForTest(); @@ -151,7 +151,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testNearUpdateResponseLost() throws Exception { Ignite ignite = grid(0); - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); int key = keyForTest(); @@ -191,7 +191,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testDhtUpdateRequestLost() throws Exception { Ignite ignite = grid(0); - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); int key = keyForTest(); @@ -229,7 +229,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testDhtUpdateResponseLost() throws Exception { Ignite ignite = grid(0); - IgniteCache<Object, Object> cache = ignite.jcache(null); + IgniteCache<Object, Object> cache = ignite.cache(null); IgniteCache<Object, Object> cacheAsync = cache.withAsync(); int key = keyForTest(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index 123e2b6..ee6e074 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -87,7 +87,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { for (Ignite g : G.allGrids()) - g.jcache(null).clear(); + g.cache(null).clear(); } /** @@ -100,9 +100,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes CacheEventListener lsnr = new CacheEventListener(latch); try { - IgniteCache<String, String> cache1 = ignite1.jcache(null); - IgniteCache<String, String> cache2 = ignite2.jcache(null); - IgniteCache<String, String> cache3 = ignite3.jcache(null); + IgniteCache<String, String> cache1 = ignite1.cache(null); + IgniteCache<String, String> cache2 = ignite2.cache(null); + IgniteCache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); @@ -175,11 +175,11 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes CacheEventListener lsnr = new CacheEventListener(latch); try { - IgniteCache<String, String> cache1 = ignite1.jcache(null); + IgniteCache<String, String> cache1 = ignite1.cache(null); IgniteCache<String, String> cache1Async = cache1.withAsync(); - IgniteCache<String, String> cache2 = ignite2.jcache(null); + IgniteCache<String, String> cache2 = ignite2.cache(null); IgniteCache<String, String> cache2Async = cache2.withAsync(); - IgniteCache<String, String> cache3 = ignite3.jcache(null); + IgniteCache<String, String> cache3 = ignite3.cache(null); IgniteCache<String, String> cache3Async = cache3.withAsync(); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); @@ -275,9 +275,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes IgnitePredicate<Event> lsnr = new CacheEventListener(latch); try { - IgniteCache<String, String> cache1 = ignite1.jcache(null); - IgniteCache<String, String> cache2 = ignite2.jcache(null); - IgniteCache<String, String> cache3 = ignite3.jcache(null); + IgniteCache<String, String> cache1 = ignite1.cache(null); + IgniteCache<String, String> cache2 = ignite2.cache(null); + IgniteCache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); @@ -344,9 +344,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes * @throws Exception In case of error. */ public void testPutWithExpiration() throws Exception { - IgniteCache<String, String> cache1 = ignite1.jcache(null); - IgniteCache<String, String> cache2 = ignite2.jcache(null); - IgniteCache<String, String> cache3 = ignite3.jcache(null); + IgniteCache<String, String> cache1 = ignite1.cache(null); + IgniteCache<String, String> cache2 = ignite2.cache(null); + IgniteCache<String, String> cache3 = ignite3.cache(null); cache1.put("key", "val"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index bc79835..e1e5c36 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -112,7 +112,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst for (int key = 0; key < 10; key++) { for (int i = 1; i < gridCount(); i++) { if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) - assertEquals(key, grid(i).jcache(null).localPeek(key, CachePeekMode.ONHEAP)); + assertEquals(key, grid(i).cache(null).localPeek(key, CachePeekMode.ONHEAP)); } if (nearEnabled()) @@ -158,7 +158,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst if (F.eq(g.name(), nearOnlyGridName)) { for (int k = 0; k < 10000; k++) { - IgniteCache<Object, Object> cache = g.jcache(null); + IgniteCache<Object, Object> cache = g.cache(null); String key = "key" + k; @@ -196,7 +196,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst protected IgniteCache<Object, Object> nearOnlyCache() { assert nearOnlyGridName != null; - return G.ignite(nearOnlyGridName).jcache(null); + return G.ignite(nearOnlyGridName).cache(null); } /** @@ -205,7 +205,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst protected IgniteCache<Object, Object> dhtCache() { for (int i = 0; i < gridCount(); i++) { if (!nearOnlyGridName.equals(grid(i).name())) - return grid(i).jcache(null); + return grid(i).cache(null); } assert false : "Cannot find DHT cache for this test."; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java index ebb9b40..d309701 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java @@ -72,7 +72,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac log.info("Use cache " + idx); - IgniteCache<Object, Object> cache = grid(idx).jcache(null); + IgniteCache<Object, Object> cache = grid(idx).cache(null); for (int i = 0; i < 100; i++) putAndCheckEntrySet(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java index 4bb6605..ccc9b64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java @@ -84,7 +84,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, 100L)); - IgniteCache cache = grid(0).jcache(null).withExpiryPolicy(expiry); + IgniteCache cache = grid(0).cache(null).withExpiryPolicy(expiry); for (int i = 0; i < KEYS_NUM; i++) cache.put(String.valueOf(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/distributed/GridCacheLoadingConcurrentGridStartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java index ac47b88..2f9bb96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java @@ -108,7 +108,7 @@ public class GridCacheLoadingConcurrentGridStartTest extends GridCommonAbstractT public void testLoadCacheFromStore() throws Exception { loadCache(new IgniteInClosure<Ignite>() { @Override public void apply(Ignite grid) { - grid.jcache(null).loadCache(null); + grid.cache(null).loadCache(null); } }); } @@ -140,14 +140,14 @@ public class GridCacheLoadingConcurrentGridStartTest extends GridCommonAbstractT /** Asserts cache size. */ private void assertCacheSize() { - IgniteCache<Integer, String> cache = grid(0).jcache(null); + IgniteCache<Integer, String> cache = grid(0).cache(null); assertEquals(KEYS_CNT, cache.size(CachePeekMode.PRIMARY)); int total = 0; for (int i = 0; i < GRIDS_CNT; i++) - total += grid(i).jcache(null).localSize(CachePeekMode.PRIMARY); + total += grid(i).cache(null).localSize(CachePeekMode.PRIMARY); assertEquals(KEYS_CNT, total); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index 8b8edb7..257f88a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -34,7 +34,6 @@ import java.util.concurrent.*; import java.util.concurrent.locks.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -104,8 +103,8 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { ignite1 = startGrid(1); ignite2 = startGrid(2); - cache1 = ignite1.jcache(null); - cache2 = ignite2.jcache(null); + cache1 = ignite1.cache(null); + cache2 = ignite2.cache(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java index 93cfe0b..e19442f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java @@ -65,7 +65,7 @@ public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testBasicOps() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < 1000; 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/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index ad54f69..0320476 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -91,9 +91,9 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT ignite2 = startGrid(2); ignite3 = startGrid(3); - cache1 = ignite1.jcache(null); - cache2 = ignite2.jcache(null); - cache3 = ignite3.jcache(null); + cache1 = ignite1.cache(null); + cache2 = ignite2.cache(null); + cache3 = ignite3.cache(null); cache1Async = cache1.withAsync(); cache2Async = cache2.withAsync(); @@ -194,7 +194,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT for (Ignite ignite : ignites) addListener(ignite, lsnr); - IgniteCache<Integer, String> cache1 = ignites[0].jcache(null); + IgniteCache<Integer, String> cache1 = ignites[0].cache(null); for (int i = 1; i <= cnt; i++) cache1.put(i, "val" + i); @@ -209,7 +209,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT latch.await(10, SECONDS); for (Ignite ignite : ignites) { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); if (cache == cache1) continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 7b84925..7037924 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -209,7 +209,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @throws Exception If test failed. */ public void testBasicLock() throws Exception { - IgniteCache<Integer, String> cache = ignite1.jcache(null); + IgniteCache<Integer, String> cache = ignite1.cache(null); Lock lock = cache.lock(1); @@ -249,8 +249,8 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @throws Exception If test fails. */ public void testMultiNodeLock() throws Exception { - IgniteCache<Integer, String> cache1 = ignite1.jcache(null); - IgniteCache<Integer, String> cache2 = ignite2.jcache(null); + IgniteCache<Integer, String> cache1 = ignite1.cache(null); + IgniteCache<Integer, String> cache2 = ignite2.cache(null); Lock lock1_1 = cache1.lock(1); Lock lock2_1 = cache2.lock(1); @@ -307,8 +307,8 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @throws Exception If test fails. */ public void testMultiNodeLockWithKeyLists() throws Exception { - IgniteCache<Integer, String> cache1 = ignite1.jcache(null); - IgniteCache<Integer, String> cache2 = ignite2.jcache(null); + IgniteCache<Integer, String> cache1 = ignite1.cache(null); + IgniteCache<Integer, String> cache2 = ignite2.cache(null); Collection<Integer> keys1 = Arrays.asList(1, 2, 3); Collection<Integer> keys2 = Arrays.asList(2, 3, 4); @@ -384,7 +384,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @throws IgniteCheckedException If test failed. */ public void testLockReentry() throws IgniteCheckedException { - IgniteCache<Integer, String> cache = ignite1.jcache(null); + IgniteCache<Integer, String> cache = ignite1.cache(null); Lock lock = cache.lock(1); @@ -412,7 +412,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @throws Exception If test failed. */ public void testLockMultithreaded() throws Exception { - final IgniteCache<Integer, String> cache = ignite1.jcache(null); + final IgniteCache<Integer, String> cache = ignite1.cache(null); final CountDownLatch l1 = new CountDownLatch(1); final CountDownLatch l2 = 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/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 9f8f43a..f90a190 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -263,7 +263,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra Ignite ignite = G.ignite(nodeName(0)); - IgniteCache<Integer, Integer> cache = ignite.jcache(CACHE_NAME); + IgniteCache<Integer, Integer> cache = ignite.cache(CACHE_NAME); int startKey = keysPerThread * idx; int endKey = keysPerThread * (idx + 1); @@ -490,7 +490,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra List<GridDhtCacheAdapter<Integer, Integer>> dhtCaches = null; for (int i = 0 ; i < dataNodes(); i++) { - IgniteCache<Integer, Integer> cache = G.ignite(nodeName(i)).jcache(CACHE_NAME); + IgniteCache<Integer, Integer> cache = G.ignite(nodeName(i)).cache(CACHE_NAME); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 8958132..9974ac6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -133,7 +133,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac * @return Cache. */ @Override protected <K, V> IgniteCache<K, V> jcache(int i) { - return IGNITEs.get(i).jcache(null); + return IGNITEs.get(i).cache(null); } /** @@ -176,7 +176,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac Transaction tx = g.transactions().txStart(concurrency, isolation); try { - g.jcache(null).put(KEY, VALUE); + g.cache(null).put(KEY, VALUE); int checkIdx = (idx + 1) % G.allGrids().size(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java index 6c229f0..aa4b9c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java @@ -33,7 +33,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheRebalanceMode.*; @@ -126,7 +125,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra CacheAffinityFunction aff = cacheConfiguration(grid(0).configuration(), null).getAffinity(); - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < partCnt; i++) { assertEquals(i, aff.partition(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index d0bdbe5..1417ede 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -131,7 +131,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid caches = new ArrayList<>(GRID_CNT); for (int i = 0; i < GRID_CNT; i++) - caches.add(startGrid(i).<Integer, String>jcache(null)); + caches.add(startGrid(i).<Integer, String>cache(null)); awaitPartitionMapExchange(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java index a91ecdf..e0f3f79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java @@ -95,7 +95,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA public void testPreloadEvents() throws Exception { Ignite g1 = startGrid("g1"); - IgniteCache<Integer, String> cache = g1.jcache(null); + IgniteCache<Integer, String> cache = g1.cache(null); cache.put(1, "val1"); cache.put(2, "val2"); @@ -119,7 +119,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA for (Event evt : evts) { CacheEvent cacheEvt = (CacheEvent)evt; assertEquals(EVT_CACHE_REBALANCE_OBJECT_LOADED, cacheEvt.type()); - assertEquals(g.jcache(null).getName(), cacheEvt.cacheName()); + assertEquals(g.cache(null).getName(), cacheEvt.cacheName()); assertEquals(g.cluster().localNode().id(), cacheEvt.node().id()); assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id()); assertTrue(cacheEvt.hasNewValue()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index 131c055..22f2347 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -250,7 +250,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon startGrids(); try { - IgniteCache<Integer, String> c = grid(idx).jcache(CACHE_NAME); + IgniteCache<Integer, String> c = grid(idx).cache(CACHE_NAME); for (int j = 0; j < retries; j++) { for (int i = 0; i < keyCnt; i++) @@ -270,7 +270,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon Ignite ignite = startGrid(idx); - c = ignite.jcache(CACHE_NAME); + c = ignite.cache(CACHE_NAME); affinityAfterStart(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index 049cb9d..9c5bbbc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -174,7 +174,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { ids[i] = ignites[i].cluster().localNode().id(); - caches[i] = ignites[i].jcache(CACHE_NAME); + caches[i] = ignites[i].cache(CACHE_NAME); ignites[i].events().localListen(new IgnitePredicate<Event>() { @Override public boolean apply(Event evt) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java index 4fcd001..0d72d35 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java @@ -67,7 +67,7 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCacheAbstractSelf public void testSystemTxInsideUserTx() throws Exception { IgniteKernal ignite = (IgniteKernal)grid(0); - IgniteCache<Object, Object> jcache = ignite.jcache(null); + IgniteCache<Object, Object> jcache = ignite.cache(null); try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { jcache.get("1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java index dde44cf..cb32b13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java @@ -98,9 +98,9 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).jcache("cacheA").removeAll(); - grid(0).jcache("cacheB").removeAll(); - grid(0).jcache("cacheC").removeAll(); + grid(0).cache("cacheA").removeAll(); + grid(0).cache("cacheB").removeAll(); + grid(0).cache("cacheC").removeAll(); } /** @@ -116,8 +116,8 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { Collection<String> evts = firstStore.events(); try (Transaction tx = grid.transactions().txStart()) { - IgniteCache<Object, Object> cacheA = grid.jcache("cacheA"); - IgniteCache<Object, Object> cacheB = grid.jcache("cacheB"); + IgniteCache<Object, Object> cacheA = grid.cache("cacheA"); + IgniteCache<Object, Object> cacheB = grid.cache("cacheB"); cacheA.put("1", "1"); cacheA.put("2", "2"); @@ -157,8 +157,8 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { IgniteEx grid = grid(0); try (Transaction ignored = grid.transactions().txStart()) { - IgniteCache<Object, Object> cacheA = grid.jcache("cacheA"); - IgniteCache<Object, Object> cacheC = grid.jcache("cacheC"); + IgniteCache<Object, Object> cacheA = grid.cache("cacheA"); + IgniteCache<Object, Object> cacheC = grid.cache("cacheC"); cacheA.put("1", "2"); @@ -178,8 +178,8 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { IgniteEx grid = grid(0); try (Transaction ignored = grid.transactions().txStart()) { - IgniteCache<Object, Object> cacheA = grid.jcache("cacheA"); - IgniteCache<Object, Object> cacheC = grid.jcache("cacheD"); + IgniteCache<Object, Object> cacheA = grid.cache("cacheA"); + IgniteCache<Object, Object> cacheC = grid.cache("cacheD"); cacheA.put("1", "2"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index 59dd05b..fe0f51b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -145,7 +145,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom try { IgniteKernal grid = (IgniteKernal)grid(idx); - IgniteCache<Integer, Integer> cache = grid.jcache(null); + IgniteCache<Integer, Integer> cache = grid.cache(null); List<Integer> keys = new ArrayList<>(); @@ -183,7 +183,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom for (int i = 0; i < GRID_CNT; i++) { IgniteEx grid = grid(i); - IgniteCache<Integer, Integer> cache = grid.jcache(null); + IgniteCache<Integer, Integer> cache = grid.cache(null); if (grid.affinity(null).isPrimaryOrBackup(grid.localNode(), k)) { if (val == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index b98cd94..85247d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -121,7 +121,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri final String initVal = "initialValue"; for (Integer key : keys) { - grid(originatingNode()).jcache(null).put(key, initVal); + grid(originatingNode()).cache(null).put(key, initVal); map.put(key, String.valueOf(key)); } @@ -152,7 +152,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri GridTestUtils.runAsync(new Callable<Object>() { @Override public Object call() throws Exception { - IgniteCache<Integer, String> cache = txIgniteNode.jcache(null); + IgniteCache<Integer, String> cache = txIgniteNode.cache(null); assertNotNull(cache); @@ -212,7 +212,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri private Ignite ignite; @Override public Void call() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); @@ -229,7 +229,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri UUID locNodeId = g.cluster().localNode().id(); assertEquals("Check failed for node: " + locNodeId, partial ? initVal : e.getValue(), - g.jcache(null).get(e.getKey())); + g.cache(null).get(e.getKey())); } } }
