http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java index 4a48804..9236de4 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java @@ -52,7 +52,7 @@ public class IgniteCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { * @throws Exception If failed. */ public void testWithoutStoreLoad() throws Exception { - IgniteCache<Integer, CacheValue> cache = grid(0).jcache(null); + IgniteCache<Integer, CacheValue> cache = grid(0).cache(null); for (int i = 0; i < ENTRY_CNT; i++) cache.put(i, new CacheValue(i)); @@ -73,7 +73,7 @@ public class IgniteCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { for (int i = 0; i < ENTRY_CNT; i++) putToStore(i, new CacheValue(i)); - IgniteCache<Integer, CacheValue> cache0 = grid(0).jcache(null); + IgniteCache<Integer, CacheValue> cache0 = grid(0).cache(null); cache0.loadCache(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java index 8d5255d..9c9b188 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.cache.store.*; @@ -35,7 +34,6 @@ import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import javax.cache.*; -import javax.cache.configuration.*; import javax.cache.integration.*; import java.io.*; import java.util.*; @@ -118,7 +116,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCache() throws Exception { - IgniteCache<Integer, ValueObject> cache = grid().jcache(null); + IgniteCache<Integer, ValueObject> cache = grid().cache(null); cache.loadCache(null); @@ -136,7 +134,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheAsync() throws Exception { - IgniteCache<Integer, ValueObject> cache = grid().jcache(null); + IgniteCache<Integer, ValueObject> cache = grid().cache(null); IgniteCache<Integer, ValueObject> asyncCache = cache.withAsync(); @@ -158,7 +156,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheFiltered() throws Exception { - IgniteCache<Integer, ValueObject> cache = grid().jcache(null); + IgniteCache<Integer, ValueObject> cache = grid().cache(null); cache.loadCache(new P2<Integer,ValueObject>() { @Override @@ -181,7 +179,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheAsyncFiltered() throws Exception { - IgniteCache<Integer, ValueObject> cache = grid().jcache(null); + IgniteCache<Integer, ValueObject> cache = grid().cache(null); IgniteCache<Integer, ValueObject> asyncCache = cache.withAsync(); @@ -240,7 +238,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { CompletionListenerFuture fut = new CompletionListenerFuture(); - grid().<Integer, Integer>jcache(null).loadAll(F.asSet(keys), true, fut); + grid().<Integer, Integer>cache(null).loadAll(F.asSet(keys), true, fut); fut.get(); @@ -260,7 +258,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { fut = new CompletionListenerFuture(); - grid().<Integer, Integer>jcache(null).loadAll(F.asSet(keys), true, fut); + grid().<Integer, Integer>cache(null).loadAll(F.asSet(keys), true, fut); fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index e644385..31eadd8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java @@ -245,8 +245,8 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final Ignite g = grid(0); // Put test values into cache. - final IgniteCache<Integer, String> c = g.jcache(null); - final IgniteCache<Integer, Long> cl = g.jcache(null); + final IgniteCache<Integer, String> c = g.cache(null); + final IgniteCache<Integer, Long> cl = g.cache(null); assertEquals(0, ((IgniteKernal)g).getCache(null).size()); assertEquals(0, c.query(new SqlQuery(String.class, "1 = 1")).getAll().size()); @@ -324,8 +324,8 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final Ignite g = grid(0); // Put test values into cache. - final IgniteCache<Integer, Long> c = g.jcache(null); - final IgniteCache<Integer, String> c1 = g.jcache(null); + final IgniteCache<Integer, Long> c = g.cache(null); + final IgniteCache<Integer, String> c1 = g.cache(null); assertEquals(0, ((IgniteKernal)g).getCache(null).size()); assertEquals(0, c1.query(new SqlQuery(String.class, "1 = 1")).getAll().size()); @@ -402,9 +402,9 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final Ignite g = grid(0); // Put test values into cache. - final IgniteCache<Integer, Object> c = g.jcache(null); + final IgniteCache<Integer, Object> c = g.cache(null); - assertEquals(0, g.jcache(null).size()); + assertEquals(0, g.cache(null).size()); assertEquals(0, c.query(new SqlQuery(Object.class, "1 = 1")).getAll().size()); Random rnd = new Random(); @@ -478,7 +478,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final Ignite g = grid(0); // Put test values into cache. - final IgniteCache<Integer, TestValue> c = g.jcache(null); + final IgniteCache<Integer, TestValue> c = g.cache(null); assertEquals(0, ((IgniteKernal)g).getCache(null).size()); assertEquals(0, c.query(new SqlQuery(TestValue.class, "1 = 1")).getAll().size()); @@ -555,7 +555,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final Ignite g = grid(0); // Put test values into cache. - final IgniteCache<Integer, Integer> c = g.jcache(null); + final IgniteCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) { c.put(i, i); @@ -618,7 +618,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final Ignite g = grid(0); // Put test values into cache. - final IgniteCache<Integer, Integer> c = g.jcache(null); + final IgniteCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) { c.put(i, i); @@ -677,7 +677,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes final Ignite g = grid(0); // Put test values into cache. - final IgniteCache<Integer, Integer> c = g.jcache(null); + final IgniteCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) c.put(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/IgniteCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java index 79639eb..a071d73 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java @@ -22,7 +22,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.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -92,7 +91,7 @@ public class IgniteCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstract * @throws Exception If failed. */ public void testQuery() throws Exception { - final IgniteCache<Integer, Person> cache = grid(0).jcache(null); + final IgniteCache<Integer, Person> cache = grid(0).cache(null); cache.clear(); @@ -123,7 +122,7 @@ public class IgniteCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstract * @throws Exception If failed. */ public void testQueryPut() throws Exception { - final IgniteCache<Integer, Person> cache = grid(0).jcache(null); + final IgniteCache<Integer, Person> cache = grid(0).cache(null); cache.clear(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java index d85b208..66f21a7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheAtomicFieldsQuerySelfTest.java @@ -45,7 +45,7 @@ public class IgniteCacheAtomicFieldsQuerySelfTest extends IgniteCachePartitioned */ public void testUnsupportedOperations() { try { - QueryCursor<List<?>> qry = grid(0).jcache(null).query(new SqlFieldsQuery( + QueryCursor<List<?>> qry = grid(0).cache(null).query(new SqlFieldsQuery( "update Person set name = ?").setArgs("Mary Poppins")); 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/distributed/near/IgniteCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java index 124c60b..5ae191f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java @@ -53,7 +53,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer Ignite ignite0 = grid(0); - IgniteCache<UUID, Person> cache0 = ignite0.jcache(null); + IgniteCache<UUID, Person> cache0 = ignite0.cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -92,7 +92,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer Person p3 = new Person("Mike", 1800); Person p4 = new Person("Bob", 1900); - IgniteCache<UUID, Person> cache0 = grid(0).jcache(null); + IgniteCache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java index 678d925..5dce126 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java @@ -37,7 +37,6 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -100,7 +99,7 @@ public class IgniteCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTe final long nodeLifeTime = 2 * 1000; final int logFreq = 20; - final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); + final IgniteCache<Integer, Integer> cache = grid(0).cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java index c9ef268..89e7d6e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java @@ -47,7 +47,7 @@ public class IgniteCacheReplicatedFieldsQuerySelfTest extends IgniteCacheAbstrac * @throws Exception If failed. */ public void testLostIterator() throws Exception { - IgniteCache<Object, Object> cache = grid(0).jcache(null); + IgniteCache<Object, Object> cache = grid(0).cache(null); QueryCursor<List<?>> qry = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java index 49f4463..4259cca 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java @@ -99,9 +99,9 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery ignite2 = grid(1); ignite3 = grid(2); - cache1 = ignite1.jcache(null); - cache2 = ignite2.jcache(null); - cache3 = ignite3.jcache(null); + cache1 = ignite1.cache(null); + cache2 = ignite2.cache(null); + cache3 = ignite3.cache(null); } /** @@ -111,7 +111,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery try { Ignite g = startGrid("client"); - IgniteCache<Integer, Integer> c = g.jcache(null); + IgniteCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < 10; i++) c.put(i, i); @@ -304,7 +304,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery * @throws Exception If failed. */ public void _testLostIterator() throws Exception { - IgniteCache<Integer, Integer> cache = ignite.jcache(null); + IgniteCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 1000; i++) cache.put(i, i); @@ -346,7 +346,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery try { Ignite g = startGrid(); - IgniteCache<Integer, Integer> cache = g.jcache(null); + IgniteCache<Integer, Integer> cache = g.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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java index c7373a6..c489d35 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java @@ -45,7 +45,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT * @throws Exception If test failed. */ public void testQueryLocal() throws Exception { - IgniteCache<Integer, String> cache = ignite.jcache(null); + IgniteCache<Integer, String> cache = ignite.cache(null); cache.put(1, "value1"); cache.put(2, "value2"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java index 0154372..8916786 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java @@ -155,7 +155,7 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest { IgniteCache<String, Integer> cache1 = jcache(); - IgniteCache<Object, Object> cache2 = ignite.jcache("cache-2"); + IgniteCache<Object, Object> cache2 = ignite.cache("cache-2"); assertNull(ignite.transactions().tx()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala index ae2a737..c5bc085 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala @@ -264,7 +264,7 @@ object scalar extends ScalarConversions { * this function - otherwise Scala will create `Cache[Nothing, Nothing]` * typed instance that cannot be used. */ - @inline def cache$[K, V]: Option[IgniteCache[K, V]] = Option(Ignition.ignite.jcache[K, V](null)) + @inline def cache$[K, V]: Option[IgniteCache[K, V]] = Option(Ignition.ignite.cache[K, V](null)) /** * Gets named cache from default grid. @@ -272,7 +272,7 @@ object scalar extends ScalarConversions { * @param cacheName Name of the cache to get. */ @inline def cache$[K, V](@Nullable cacheName: String): Option[IgniteCache[K, V]] = - Option(Ignition.ignite.jcache(cacheName)) + Option(Ignition.ignite.cache(cacheName)) /** * Creates cache cache with specified parameters in default grid. @@ -298,7 +298,7 @@ object scalar extends ScalarConversions { */ @inline def cache$[K, V](@Nullable gridName: String, @Nullable cacheName: String): Option[IgniteCache[K, V]] = ignite$(gridName) match { - case Some(g) => Option(g.jcache(cacheName)) + case Some(g) => Option(g.cache(cacheName)) case None => None } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index 99c7f2a..869990f 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -226,10 +226,10 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ - @Override public <K, V> IgniteCache<K, V> jcache(@Nullable String name) { + @Override public <K, V> IgniteCache<K, V> cache(@Nullable String name) { assert g != null; - return g.jcache(name); + return g.cache(name); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java index abb3422..1620973 100644 --- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java @@ -290,13 +290,13 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { Class rcrsCls = ldr.loadClass(TEST_RCRS_NAME); - IgniteCache<Long, Object> cache1 = ignite1.jcache(null); + IgniteCache<Long, Object> cache1 = ignite1.cache(null); assertNotNull(cache1); cache1.put(1L, rcrsCls.newInstance()); - final IgniteCache<Long, Object> cache2 = ignite2.jcache(null); + final IgniteCache<Long, Object> cache2 = ignite2.cache(null); assertNotNull(cache2); @@ -316,7 +316,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { ignite1 = startGrid("testCacheRedeployVersionChangeContinuousMode1"); - cache1 = ignite1.jcache(null); + cache1 = ignite1.cache(null); assertNotNull(cache1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java index 3e2f544..08575a2 100644 --- a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java @@ -92,7 +92,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid().jcache(CACHE_NAME).removeAll(); + grid().cache(CACHE_NAME).removeAll(); grid().destroyCache(DYNAMIC_CACHE_NAME); } @@ -108,7 +108,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { assertEquals(3, svc.called()); - IgniteCache<Integer, String> c = grid().jcache(CACHE_NAME); + IgniteCache<Integer, String> c = grid().cache(CACHE_NAME); assertEquals(3, c.size()); @@ -127,7 +127,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { assertEquals(3, svc.called()); - IgniteCache<GridSpringCacheTestKey, String> c = grid().jcache(CACHE_NAME); + IgniteCache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); assertEquals(3, c.size()); @@ -139,7 +139,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSimpleKeyPut() throws Exception { - IgniteCache<Integer, String> c = grid().jcache(CACHE_NAME); + IgniteCache<Integer, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) { assertEquals("value" + i + "odd", svc.simpleKeyPut(i)); @@ -160,7 +160,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testComplexKeyPut() throws Exception { - IgniteCache<GridSpringCacheTestKey, String> c = grid().jcache(CACHE_NAME); + IgniteCache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) { assertEquals("value" + i + "suffix" + i + "odd", svc.complexKeyPut(i, "suffix" + i)); @@ -181,7 +181,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSimpleKeyEvict() throws Exception { - IgniteCache<Integer, String> c = grid().jcache(CACHE_NAME); + IgniteCache<Integer, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) c.put(i, "value" + i); @@ -205,7 +205,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testComplexKeyEvict() throws Exception { - IgniteCache<GridSpringCacheTestKey, String> c = grid().jcache(CACHE_NAME); + IgniteCache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) c.put(new GridSpringCacheTestKey(i, "suffix" + i), "value" + i); @@ -229,7 +229,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testEvictAll() throws Exception { - IgniteCache<Integer, String> c = grid().jcache(CACHE_NAME); + IgniteCache<Integer, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) c.put(i, "value" + i); @@ -256,7 +256,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { assertEquals(3, dynamicSvc.called()); - IgniteCache<Integer, String> c = grid().jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Integer, String> c = grid().cache(DYNAMIC_CACHE_NAME); // Check that correct config is used. assertEquals(2, c.getConfiguration(CacheConfiguration.class).getBackups()); @@ -278,7 +278,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { assertEquals(6, dynamicSvc.called()); - IgniteCache<Integer, String> c = grid().jcache(DYNAMIC_CACHE_NAME); + IgniteCache<Integer, String> c = grid().cache(DYNAMIC_CACHE_NAME); // Check that correct config is used. assertEquals(2, c.getConfiguration(CacheConfiguration.class).getBackups()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala index 13e7040..2e51698 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala @@ -78,9 +78,9 @@ class VisorCacheClearCommandSpec extends VisorRuntimeBaseSpec(2) { behavior of "An 'cclear' visor command" it should "show correct result for default cache" in { - Ignition.ignite("node-1").jcache[Int, Int](null).putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) + Ignition.ignite("node-1").cache[Int, Int](null).putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) - val lock = Ignition.ignite("node-1").jcache[Int, Int](null).lock(1) + val lock = Ignition.ignite("node-1").cache[Int, Int](null).lock(1) lock.lock() @@ -92,9 +92,9 @@ class VisorCacheClearCommandSpec extends VisorRuntimeBaseSpec(2) { } it should "show correct result for named cache" in { - Ignition.ignite("node-1").jcache[Int, Int]("cache").putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) + Ignition.ignite("node-1").cache[Int, Int]("cache").putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) - val lock = Ignition.ignite("node-1").jcache[Int, Int]("cache").lock(1) + val lock = Ignition.ignite("node-1").cache[Int, Int]("cache").lock(1) lock.lock() http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala index 59954fe..4724006 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala @@ -82,7 +82,7 @@ class VisorCacheCommandSpec extends VisorRuntimeBaseSpec(1) { } it should "put/get some values to/from cache and display information about caches" in { - val c = Ignition.ignite("node-1").jcache[String, String]("replicated") + val c = Ignition.ignite("node-1").cache[String, String]("replicated") for (i <- 0 to 3) { val kv = "" + i @@ -98,7 +98,7 @@ class VisorCacheCommandSpec extends VisorRuntimeBaseSpec(1) { it should "run query and display information about caches" in { val g = Ignition.ignite("node-1") - val c = g.jcache[JavaInt, Foo]("replicated") + val c = g.cache[JavaInt, Foo]("replicated") c.put(0, Foo(20)) c.put(1, Foo(100)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala index 1bc3001..f5af1d3 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala @@ -72,13 +72,13 @@ class VisorCacheSwapCommandSpec extends VisorRuntimeBaseSpec(2) { behavior of "An 'cswap' visor command" it should "show correct result for default cache" in { - Ignition.ignite("node-1").jcache[Int, Int](null).putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) + Ignition.ignite("node-1").cache[Int, Int](null).putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) visor.cache("-swap -c=<default>") } it should "show correct result for named cache" in { - Ignition.ignite("node-1").jcache[Int, Int]("cache").putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) + Ignition.ignite("node-1").cache[Int, Int]("cache").putAll(Map(1 -> 1, 2 -> 2, 3 -> 3)) visor.cache("-swap -c=cache") } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java index dab2053..91db257 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java @@ -212,7 +212,7 @@ public class WebSessionFilter implements Filter { throw new IgniteException("Grid for web sessions caching is not started (is it configured?): " + gridName); - cache = webSesIgnite.jcache(cacheName); + cache = webSesIgnite.cache(cacheName); if (cache == null) throw new IgniteException("Cache for web sessions is not started (is it configured?): " + cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java index 198bfca..ad04279 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java @@ -86,7 +86,7 @@ public class WebSessionSelfTest extends GridCommonAbstractTest { try (BufferedReader rdr = new BufferedReader(new InputStreamReader(conn.getInputStream()))) { String sesId = rdr.readLine(); - IgniteCache<String, HttpSession> cache = G.ignite().jcache(getCacheName()); + IgniteCache<String, HttpSession> cache = G.ignite().cache(getCacheName()); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java index 4e4ee9d..fd7a5ca 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java @@ -36,6 +36,6 @@ public class IgniteGetBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic"); + return ignite().cache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java index 20bf68d..ef58093 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgniteGetOffHeapBenchmark extends IgniteGetBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic-offheap"); + return ignite().cache("atomic-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java index e68fd99..1bfdd1e 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgniteGetOffHeapValuesBenchmark extends IgniteGetBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic-offheap-values"); + return ignite().cache("atomic-offheap-values"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java index 1993ac8..ff6750a 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutBenchmark.java @@ -37,6 +37,6 @@ public class IgnitePutBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic"); + return ignite().cache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java index cb6e220..b8e032c 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetBenchmark.java @@ -42,6 +42,6 @@ public class IgnitePutGetBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic"); + return ignite().cache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java index 432e0c3..9c333e7 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutGetOffHeapBenchmark extends IgnitePutGetBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic-offheap"); + return ignite().cache("atomic-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java index 9e1368e..a8b4a4b 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutGetOffHeapValuesBenchmark extends IgnitePutGetBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic-offheap-values"); + return ignite().cache("atomic-offheap-values"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java index f8276bd..2562cf0 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java @@ -47,6 +47,6 @@ public class IgnitePutGetTxBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("tx"); + return ignite().cache("tx"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java index 4311c27..322e3b1 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutGetTxOffHeapBenchmark extends IgnitePutGetTxBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("tx-offheap"); + return ignite().cache("tx-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java index a894899..522e354 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutGetTxOffHeapValuesBenchmark extends IgnitePutGetTxBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("tx-offheap-values"); + return ignite().cache("tx-offheap-values"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java index 1e63ce8..4ac773a 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutOffHeapBenchmark extends IgnitePutBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic-offheap"); + return ignite().cache("atomic-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java index d6aacb2..22333e6 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutOffHeapValuesBenchmark extends IgnitePutBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("atomic-offheap-values"); + return ignite().cache("atomic-offheap-values"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java index ebf4f20..799e89c 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java @@ -38,6 +38,6 @@ public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("tx"); + return ignite().cache("tx"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java index 18c65fe..6e84048 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutTxOffHeapBenchmark extends IgnitePutTxBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("tx-offheap"); + return ignite().cache("tx-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java index 5691a4f..85cb8e0 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgnitePutTxOffHeapValuesBenchmark extends IgnitePutTxBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("tx-offheap-values"); + return ignite().cache("tx-offheap-values"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java index 172c142..b49170d 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java @@ -87,6 +87,6 @@ public class IgniteSqlQueryBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query"); + return ignite().cache("query"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java index 4ab757a..6d16a2d 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java @@ -111,6 +111,6 @@ public class IgniteSqlQueryJoinBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query"); + return ignite().cache("query"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java index 517aabf..68b5438 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgniteSqlQueryJoinOffHeapBenchmark extends IgniteSqlQueryJoinBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query-offheap"); + return ignite().cache("query-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java index 42bda51..78bfb47 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgniteSqlQueryOffHeapBenchmark extends IgniteSqlQueryBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query-offheap"); + return ignite().cache("query-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java index 9f1e136..56ec82c 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java @@ -79,6 +79,6 @@ public class IgniteSqlQueryPutBenchmark extends IgniteCacheAbstractBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query"); + return ignite().cache("query"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java index d5c2012..f3c27a5 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java @@ -27,6 +27,6 @@ import org.apache.ignite.cache.*; public class IgniteSqlQueryPutOffHeapBenchmark extends IgniteSqlQueryPutBenchmark { /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query-offheap"); + return ignite().cache("query-offheap"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java index e426332..b1c26a6 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java @@ -42,6 +42,6 @@ public class IgniteJdbcStoreGetBenchmark extends IgniteJdbcStoreAbstractBenchmar /** {@inheritDoc} */ @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("atomic"); + return ignite().cache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java index 947ec1e..693592e 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java @@ -42,6 +42,6 @@ public class IgniteJdbcStoreGetTxBenchmark extends IgniteJdbcStoreAbstractBenchm /** {@inheritDoc} */ @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("tx"); + return ignite().cache("tx"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java index 4b70eeb..9447725 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java @@ -42,6 +42,6 @@ public class IgniteJdbcStorePutBenchmark extends IgniteJdbcStoreAbstractBenchmar /** {@inheritDoc} */ @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("atomic"); + return ignite().cache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java index 330f09c..a173116 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java @@ -47,6 +47,6 @@ public class IgniteJdbcStorePutGetBenchmark extends IgniteJdbcStoreAbstractBench /** {@inheritDoc} */ @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("atomic"); + return ignite().cache("atomic"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java index 81b1637..bdd18be 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java @@ -47,6 +47,6 @@ public class IgniteJdbcStorePutGetTxBenchmark extends IgniteJdbcStoreAbstractBen /** {@inheritDoc} */ @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("tx"); + return ignite().cache("tx"); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34046ec8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java index f470265..7d0bfd8 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java @@ -42,6 +42,6 @@ public class IgniteJdbcStorePutTxBenchmark extends IgniteJdbcStoreAbstractBenchm /** {@inheritDoc} */ @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("tx"); + return ignite().cache("tx"); } }
