http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index a5fc80b..7c79018 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -192,8 +192,8 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @return Cache to use in tests. * @throws Exception If failed. */ - private Cache<Long, Long> populate() throws Exception { - Cache<Long, Long> cache = grid(0).cache(null); + private GridCache<Long, Long> populate() throws Exception { + GridCache<Long, Long> cache = grid(0).cache(null); assertEquals(0, cache.size()); assertEquals(0, cache.offHeapEntriesCount()); @@ -343,7 +343,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIterators() throws Exception { - Cache<Long, Long> cache = populate(); + GridCache<Long, Long> cache = populate(); int cnt = 0; @@ -381,7 +381,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSql() throws Exception { - Cache<Long, Long> cache = populate(); + GridCache<Long, Long> cache = populate(); Collection<Map.Entry<Long, Long>> res = cache.queries(). createSqlQuery(Long.class, "_val >= ? and _val < ?"). @@ -412,7 +412,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testUnswap() throws Exception { - Cache<Long, Long> cache = populate(); + GridCache<Long, Long> cache = populate(); for (long i = from; i < to; i++) { Long val = cache.promote(i); @@ -438,7 +438,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testUnswapAll() throws Exception { - Cache<Long, Long> cache = populate(); + GridCache<Long, Long> cache = populate(); Collection<Long> keys = new HashSet<>(); @@ -461,7 +461,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testGet() throws Exception { - Cache<Long, Long> cache = populate(); + GridCache<Long, Long> cache = populate(); for (long i = from; i < to; i++) { Long val = cache.get(i); @@ -485,7 +485,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testPeek() throws Exception { - Cache<Long, Long> cache = populate(); + GridCache<Long, Long> cache = populate(); for (long i = from; i < to; i++) { assertNull(cache.peek(i)); @@ -510,7 +510,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIteratorsCleanup() throws Exception { - final Cache<Long, Long> cache = populate(); + final GridCache<Long, Long> cache = populate(); IgniteFuture<?> offHeapFut = multithreadedAsync(new Runnable() { @Override public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java index 0545b7c..7c93844 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.Cache; +import org.apache.ignite.cache.GridCache; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -112,7 +112,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCache() throws Exception { - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); cache.loadCache(null, 0); @@ -130,7 +130,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheAsync() throws Exception { - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); cache.loadCacheAsync(null, 0).get(); @@ -148,7 +148,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheFiltered() throws Exception { - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); cache.loadCache(new P2<Integer, ValueObject>() { @Override public boolean apply(Integer key, ValueObject val) { @@ -170,7 +170,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLoadCacheAsyncFiltered() throws Exception { - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); cache.loadCacheAsync(new P2<Integer, ValueObject>() { @Override public boolean apply(Integer key, ValueObject val) { @@ -194,7 +194,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { public void testReload() throws Exception { STORE_MAP.put(1, new ValueObject(1)); - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); ValueObject vo = cache.reload(1); @@ -217,7 +217,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { public void testReloadAsync() throws Exception { STORE_MAP.put(1, new ValueObject(1)); - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); assert cache.reloadAsync(1).get().value() == 1; @@ -238,7 +238,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < PUT_CNT; i++) STORE_MAP.put(i, new ValueObject(i)); - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); Integer[] keys = new Integer[PUT_CNT - 5]; @@ -280,7 +280,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < PUT_CNT; i++) STORE_MAP.put(i, new ValueObject(i)); - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); Integer[] keys = new Integer[PUT_CNT - 5]; @@ -320,7 +320,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReloadAllFiltered() throws Exception { - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); for (int i = 0; i < PUT_CNT; i++) assert cache.putx(i, new ValueObject(i)); @@ -358,7 +358,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReloadAllAsyncFiltered() throws Exception { - Cache<Integer, ValueObject> cache = cache(); + GridCache<Integer, ValueObject> cache = cache(); for (int i = 0; i < PUT_CNT; i++) assert cache.putx(i, new ValueObject(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java index f7e2ac0..0122336 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -85,7 +85,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testAccumulativeMetrics() throws Exception { - Cache<String, Integer> cache = cache(0); + GridCache<String, Integer> cache = cache(0); CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") .projection(grid(0)); @@ -127,7 +127,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testSingleQueryMetrics() throws Exception { - Cache<String, Integer> cache = cache(0); + GridCache<String, Integer> cache = cache(0); CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") .projection(grid(0)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 6ecf820..096bb2e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -153,7 +153,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) { - Cache<Object, Object> c = grid(i).cache(null); + GridCache<Object, Object> c = grid(i).cache(null); assertEquals(0, c.size()); } @@ -182,7 +182,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) { - Cache<Object, Object> c = grid(i).cache(null); + GridCache<Object, Object> c = grid(i).cache(null); c.removeAll(F.<CacheEntry<Object, Object>>alwaysTrue()); @@ -242,7 +242,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final Cache<Integer, String> c = g.cache(null); + final GridCache<Integer, String> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 1").execute().get().size()); @@ -322,7 +322,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final Cache<Integer, Long> c = g.cache(null); + final GridCache<Integer, Long> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 1").execute().get().size()); @@ -404,7 +404,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final Cache<Integer, Object> c = g.cache(null); + final GridCache<Integer, Object> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.offHeapEntriesCount()); @@ -487,7 +487,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final Cache<Integer, TestValue> c = g.cache(null); + final GridCache<Integer, TestValue> c = g.cache(null); assertEquals(0, g.cache(null).size()); assertEquals(0, c.queries().createSqlQuery(String.class, "1 = 1").execute().get().size()); @@ -568,7 +568,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - Cache<Integer, Integer> c = g.cache(null); + GridCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) { c.putx(i, i); @@ -636,7 +636,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - final Cache<Integer, Integer> c = g.cache(null); + final GridCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) { c.putx(i, i); @@ -699,7 +699,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - Cache<Integer, Integer> c = g.cache(null); + GridCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) c.putx(i, i); @@ -788,7 +788,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final Ignite g = grid(0); // Put test values into cache. - Cache<Integer, Integer> c = g.cache(null); + GridCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < keyCnt; i++) c.putx(i, i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index 1ef14c0..07e0d32 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -84,7 +84,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract final int keyCnt = 5000; final int logFreq = 500; - final Cache<String, Integer> c = cache(); + final GridCache<String, Integer> c = cache(); final CountDownLatch startLatch = new CountDownLatch(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java index 66d2eac..4681028 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java @@ -84,7 +84,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe * @throws Exception If failed. */ public void testQuery() throws Exception { - final Cache<Integer, Person> cache = grid(0).cache(null); + final GridCache<Integer, Person> cache = grid(0).cache(null); for (int i = 0; i < 2000; i++) cache.put(i, new Person(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index 4c9801b..6321ab2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -148,8 +148,8 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); - Cache<Integer, Object> cache1 = ignite1.cache(null); - Cache<Integer, Object> cache2 = ignite2.cache(null); + GridCache<Integer, Object> cache1 = ignite1.cache(null); + GridCache<Integer, Object> cache2 = ignite2.cache(null); Object v1 = new CacheValue(1); @@ -263,7 +263,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED, EVT_SWAP_SPACE_DATA_EVICTED); - Cache<Integer, CacheValue> cache = grid(0).cache(null); + GridCache<Integer, CacheValue> cache = grid(0).cache(null); for (int i = 0; i< 20; i++) { cache.put(i, new CacheValue(i)); @@ -323,7 +323,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED); - Cache<Integer, CacheValue> cache = grid(0).cache(null); + GridCache<Integer, CacheValue> cache = grid(0).cache(null); populate(cache); evictAll(cache); @@ -371,7 +371,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { grid(0); - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) { info("Putting: " + i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 66e5bf2..dc433c3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -94,7 +94,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testQuery() throws Exception { - Cache<Integer, ObjectValue> cache = ignite.cache(null); + GridCache<Integer, ObjectValue> cache = ignite.cache(null); int cnt = 10; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index dbbd6e3..01debfc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -54,7 +54,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Person p3 = new Person("Mike", 1800); Person p4 = new Person("Bob", 1900); - Cache<UUID, Person> cache0 = grid(0).cache(null); + GridCache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -94,7 +94,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Ignite ignite0 = grid(0); - Cache<UUID, Person> cache0 = ignite0.cache(null); + GridCache<UUID, Person> cache0 = ignite0.cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -133,7 +133,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Person p3 = new Person("Mike", 1800); Person p4 = new Person("Bob", 1900); - Cache<UUID, Person> cache0 = grid(0).cache(null); + GridCache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -195,7 +195,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel Person p3 = new Person("Mike", 1800); Person p4 = new Person("Bob", 1900); - Cache<UUID, Person> cache0 = grid(0).cache(null); + GridCache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -235,7 +235,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel */ @SuppressWarnings("FloatingPointEquality") public void testScanReduceQuery() throws Exception { - Cache<UUID, Person> c = ignite.cache(null); + GridCache<UUID, Person> c = ignite.cache(null); Person p1 = new Person("Bob White", 1000); Person p2 = new Person("Tom White", 2000); @@ -293,7 +293,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel */ @SuppressWarnings("FloatingPointEquality") public void testSqlReduceQuery() throws Exception { - Cache<UUID, Person> c = ignite.cache(null); + GridCache<UUID, Person> c = ignite.cache(null); Person p1 = new Person("Bob White", 1000); Person p2 = new Person("Tom White", 2000); @@ -347,7 +347,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel */ @SuppressWarnings("FloatingPointEquality") public void testLuceneReduceQuery() throws Exception { - Cache<UUID, Person> c = ignite.cache(null); + GridCache<UUID, Person> c = ignite.cache(null); Person p1 = new Person("Bob White", 1000); Person p2 = new Person("Tom White", 2000); @@ -422,7 +422,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel for (int i = 0; i < gridCount(); i++) assertEquals(i == 1 ? 2 : 3, grid(i).cache(null).primarySize()); - Cache<Integer, Integer> cache = ignite.cache(null); + GridCache<Integer, Integer> cache = ignite.cache(null); CacheQuery<Map.Entry<Integer, Integer>> q = cache.queries().createSqlQuery(Integer.class, "_key >= 0"); @@ -439,7 +439,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel * @throws Exception If failed. */ public void testReduceWithPagination() throws Exception { - Cache<Integer, Integer> c = grid(0).cache(null); + GridCache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < 50; i++) assertTrue(c.putx(i, 10)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index 859890c..33a5001 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -102,7 +102,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest final long nodeLifeTime = 2 * 1000; final int logFreq = 20; - final Cache<Integer, Integer> cache = grid(0).cache(null); + final GridCache<Integer, Integer> cache = grid(0).cache(null); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java index 1a5931c..ab02b26 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java @@ -66,7 +66,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie Ignite g = startGrid(); - Cache<Integer, Integer> cache = g.cache(null); + GridCache<Integer, Integer> cache = g.cache(null); CacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery("select _key from Integer where _key >= " + "0 order by _key"); @@ -121,7 +121,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie * @throws Exception If failed. */ public void testLostIterator() throws Exception { - Cache<Integer, Integer> cache = grid(0).cache(null); + GridCache<Integer, Integer> cache = grid(0).cache(null); CacheQueryFuture<List<?>> fut = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index 60e5e8a..4feb06a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -62,13 +62,13 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf private static Ignite ignite3; /** Cache1. */ - private static Cache<CacheKey, CacheValue> cache1; + private static GridCache<CacheKey, CacheValue> cache1; /** Cache2. */ - private static Cache<CacheKey, CacheValue> cache2; + private static GridCache<CacheKey, CacheValue> cache2; /** Cache3. */ - private static Cache<CacheKey, CacheValue> cache3; + private static GridCache<CacheKey, CacheValue> cache3; /** Key serialization cnt. */ private static volatile int keySerCnt; @@ -112,7 +112,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf try { Ignite g = startGrid("client"); - Cache<Integer, Integer> c = g.cache(null); + GridCache<Integer, Integer> c = g.cache(null); for (int i = 0; i < 10; i++) c.putx(i, i); @@ -379,7 +379,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf * @throws Exception If failed. */ public void testLostIterator() throws Exception { - Cache<Integer, Integer> cache = ignite.cache(null); + GridCache<Integer, Integer> cache = ignite.cache(null); for (int i = 0; i < 1000; i++) assertTrue(cache.putx(i, i)); @@ -424,7 +424,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf try { Ignite g = startGrid(); - Cache<Integer, Integer> cache = g.cache(null); + GridCache<Integer, Integer> cache = g.cache(null); for (int i = 0; i < 1000; i++) assertTrue(cache.putx(i, i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java index e95f214..91dd34b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java @@ -44,7 +44,7 @@ public class GridCacheLocalQuerySelfTest extends GridCacheAbstractQuerySelfTest * @throws IgniteCheckedException If test failed. */ public void testQueryLocal() throws Exception { - Cache<Integer, String> cache = ignite.cache(null); + GridCache<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/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java index 10b8b55..a56a44f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java @@ -149,8 +149,8 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { cache().queries().rebuildAllIndexes().get(); - Cache<Integer, TestValue1> cache1 = grid(0).cache(null); - Cache<Integer, TestValue2> cache2 = grid(0).cache(null); + GridCache<Integer, TestValue1> cache1 = grid(0).cache(null); + GridCache<Integer, TestValue2> cache2 = grid(0).cache(null); for (int i = 0; i < ENTRY_CNT; i++) { cache1.put(i, new TestValue1(i, "val2-" + i, i, i)); @@ -195,8 +195,8 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { public void testRebuildInterrupted() throws Exception { spi.sleepInRebuild = true; - Cache<Integer, TestValue1> cache1 = grid(0).cache(null); - Cache<Integer, TestValue2> cache2 = grid(0).cache(null); + GridCache<Integer, TestValue1> cache1 = grid(0).cache(null); + GridCache<Integer, TestValue2> cache2 = grid(0).cache(null); cache1.put(0, new TestValue1(0, "val0", 0 ,0)); cache2.put(1, new TestValue2(0, "val0")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java index b53abd4..a878ffa 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java @@ -57,7 +57,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { */ @SuppressWarnings("unchecked") public void testGeo() throws Exception { - Cache<Integer, EnemyCamp> cache = grid(0).cache(null); + GridCache<Integer, EnemyCamp> cache = grid(0).cache(null); WKTReader r = new WKTReader(); @@ -113,9 +113,9 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { */ @SuppressWarnings("unchecked") public void testGeoMultithreaded() throws Exception { - final Cache<Integer, EnemyCamp> cache1 = grid(0).cache(null); - final Cache<Integer, EnemyCamp> cache2 = grid(1).cache(null); - final Cache<Integer, EnemyCamp> cache3 = grid(2).cache(null); + final GridCache<Integer, EnemyCamp> cache1 = grid(0).cache(null); + final GridCache<Integer, EnemyCamp> cache2 = grid(1).cache(null); + final GridCache<Integer, EnemyCamp> cache3 = grid(2).cache(null); final String[] points = new String[CNT]; @@ -146,7 +146,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { while (!stop.get()) { int cacheIdx = rnd.nextInt(0, 3); - Cache<Integer, EnemyCamp> cache = cacheIdx == 0 ? cache1 : cacheIdx == 1 ? cache2 : cache3; + GridCache<Integer, EnemyCamp> cache = cacheIdx == 0 ? cache1 : cacheIdx == 1 ? cache2 : cache3; int idx = rnd.nextInt(CNT); int x = rnd.nextInt(1, 100); @@ -171,7 +171,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { try { int cacheIdx = rnd.nextInt(0, 3); - Cache<Integer, EnemyCamp> cache = cacheIdx == 0 ? cache1 : cacheIdx == 1 ? cache2 : cache3; + GridCache<Integer, EnemyCamp> cache = cacheIdx == 0 ? cache1 : cacheIdx == 1 ? cache2 : cache3; CacheQuery<Map.Entry<Integer, EnemyCamp>> qry = cache.queries().createSqlQuery( EnemyCamp.class, "coords && ?"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 8b67d68..9502b64 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 @@ -148,9 +148,9 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest { public void _testJtaTwoCaches() throws Exception { // TODO GG-9141 UserTransaction jtaTx = jotm.getUserTransaction(); - Cache<String, Integer> cache1 = cache(); + GridCache<String, Integer> cache1 = cache(); - Cache<String, Integer> cache2 = grid(0).cache("cache-2"); + GridCache<String, Integer> cache2 = grid(0).cache("cache-2"); assertNull(cache1.tx()); assertNull(cache2.tx()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala index cbc1f5c..898d66d 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala @@ -18,7 +18,7 @@ package org.gridgain.scalar import org.apache.ignite.Ignite -import org.apache.ignite.cache.{CacheEntry, Cache, CacheProjection} +import org.apache.ignite.cache.{CacheEntry, GridCache, CacheProjection} import org.apache.ignite.cluster.ClusterGroup import org.apache.ignite.compute.ComputeJob import org.apache.ignite.lang._ @@ -397,7 +397,7 @@ trait ScalarConversions { * * @param impl Grid cache to convert. */ - implicit def toScalarCache[K, V](impl: Cache[K, V]): ScalarCachePimp[K, V] = + implicit def toScalarCache[K, V](impl: GridCache[K, V]): ScalarCachePimp[K, V] = ScalarCachePimp[K, V](impl) /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala index 94c4ea1..02b30f1 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala @@ -17,7 +17,7 @@ package org.gridgain.scalar.pimps -import org.apache.ignite.cache.Cache +import org.apache.ignite.cache.GridCache /** * ==Overview== @@ -38,13 +38,13 @@ import org.apache.ignite.cache.Cache * Instead of giving two different names to the same function we've decided to simply mark * Scala's side method with `$` suffix. */ -class ScalarCachePimp[K, V] extends ScalarCacheProjectionPimp[K, V] with Ordered[Cache[K, V]] { +class ScalarCachePimp[K, V] extends ScalarCacheProjectionPimp[K, V] with Ordered[GridCache[K, V]] { /** * Compares this cache name to the given cache name. * * @param that Another cache instance to compare names with. */ - def compare(that: Cache[K, V]): Int = that.name.compareTo(value.name) + def compare(that: GridCache[K, V]): Int = that.name.compareTo(value.name) } /** @@ -56,7 +56,7 @@ object ScalarCachePimp { * * @param impl Java-side implementation. */ - def apply[K, V](impl: Cache[K, V]) = { + def apply[K, V](impl: GridCache[K, V]) = { if (impl == null) throw new NullPointerException("impl") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 345aa37..506d227 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 @@ -18,7 +18,7 @@ package org.gridgain.scalar import java.net.URL -import org.apache.ignite.cache.Cache +import org.apache.ignite.cache.GridCache import org.apache.ignite.cache.query.{CacheQuerySqlField, CacheQueryTextField} import org.apache.ignite.internal.GridProductImpl import org.apache.ignite.{IgniteState, IgniteDataLoader, Ignition, Ignite} @@ -265,7 +265,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[Cache[K, V]] = + @inline def cache$[K, V]: Option[GridCache[K, V]] = Option(Ignition.ignite.cache[K, V](null)) /** @@ -273,7 +273,7 @@ object scalar extends ScalarConversions { * * @param cacheName Name of the cache to get. */ - @inline def cache$[K, V](@Nullable cacheName: String): Option[Cache[K, V]] = + @inline def cache$[K, V](@Nullable cacheName: String): Option[GridCache[K, V]] = Option(Ignition.ignite.cache(cacheName)) /** @@ -282,7 +282,7 @@ object scalar extends ScalarConversions { * @param gridName Name of the grid. * @param cacheName Name of the cache to get. */ - @inline def cache$[K, V](@Nullable gridName: String, @Nullable cacheName: String): Option[Cache[K, V]] = + @inline def cache$[K, V](@Nullable gridName: String, @Nullable cacheName: String): Option[GridCache[K, V]] = grid$(gridName) match { case Some(g) => Option(g.cache(cacheName)) case None => None http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala index 21426e0..0bc66ea 100644 --- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala +++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala @@ -17,7 +17,7 @@ package org.gridgain.scalar.tests -import org.apache.ignite.cache.Cache +import org.apache.ignite.cache.GridCache import org.apache.ignite.cluster.ClusterNode import org.gridgain.scalar._ import scalar._ @@ -41,7 +41,7 @@ class ScalarCacheQueriesSpec extends FlatSpec with ShouldMatchers with BeforeAnd private var n: ClusterNode = null /** Cache. */ - private var c: Cache[Int, ObjectValue] = null + private var c: GridCache[Int, ObjectValue] = null /** * Start node and put data to cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 95b5e57..94d7116 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -137,7 +137,7 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ - @Override public Collection<Cache<?, ?>> caches() { + @Override public Collection<GridCache<?, ?>> caches() { assert g != null; return g.caches(); @@ -256,7 +256,7 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ - @Override public <K, V> Cache<K, V> cache(String name) { + @Override public <K, V> GridCache<K, V> cache(String name) { assert g != null; return g.cache(name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java index 9ab975a..eb641d7 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; +import org.springframework.cache.*; import org.springframework.cache.support.*; import java.io.*; @@ -68,7 +69,7 @@ class SpringCache implements Cache, Serializable { } /** {@inheritDoc} */ - @Override public ValueWrapper get(Object key) { + @Override public Cache.ValueWrapper get(Object key) { try { Object val = cache.get(keyFactory.apply(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java index a671b36..a143f13 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.spring; import org.apache.ignite.*; -import org.apache.ignite.cache.Cache; +import org.apache.ignite.cache.GridCache; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; @@ -232,8 +232,8 @@ public class SpringCacheManager implements CacheManager, InitializingBean { @Override public Collection<String> getCacheNames() { assert grid != null; - return F.viewReadOnly(grid.caches(), new IgniteClosure<Cache<?,?>, String>() { - @Override public String apply(Cache<?, ?> c) { + return F.viewReadOnly(grid.caches(), new IgniteClosure<GridCache<?,?>, String>() { + @Override public String apply(GridCache<?, ?> c) { return c.name(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java index 608f800..c37fe8f 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.spring; import org.apache.ignite.*; -import org.apache.ignite.cache.Cache; +import org.apache.ignite.cache.GridCache; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; @@ -79,7 +79,7 @@ public class SpringDynamicCacheManager extends SpringCacheManager { private GridCacheProjectionEx<MetaKey, org.springframework.cache.Cache> metaCache; /** Data cache. */ - private Cache<DataKey, Object> dataCache; + private GridCache<DataKey, Object> dataCache; /** * Sets data cache name. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 e827e3c..4152113 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 @@ -289,13 +289,13 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { Class rcrsCls = ldr.loadClass(TEST_RCRS_NAME); - Cache<Long, Object> cache1 = ignite1.cache(null); + GridCache<Long, Object> cache1 = ignite1.cache(null); assertNotNull(cache1); cache1.put(1L, rcrsCls.newInstance()); - final Cache<Long, Object> cache2 = ignite2.cache(null); + final GridCache<Long, Object> cache2 = ignite2.cache(null); assertNotNull(cache2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 a4a460b..1d888c4 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 @@ -98,7 +98,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { assertEquals(3, svc.called()); - Cache<Integer, String> c = grid().cache(CACHE_NAME); + GridCache<Integer, String> c = grid().cache(CACHE_NAME); assertEquals(3, c.size()); @@ -117,7 +117,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { assertEquals(3, svc.called()); - Cache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); + GridCache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); assertEquals(3, c.size()); @@ -129,7 +129,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSimpleKeyPut() throws Exception { - Cache<Integer, String> c = grid().cache(CACHE_NAME); + GridCache<Integer, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) { assertEquals("value" + i + "odd", svc.simpleKeyPut(i)); @@ -150,7 +150,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testComplexKeyPut() throws Exception { - Cache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); + GridCache<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)); @@ -171,7 +171,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSimpleKeyEvict() throws Exception { - Cache<Integer, String> c = grid().cache(CACHE_NAME); + GridCache<Integer, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) c.putx(i, "value" + i); @@ -195,7 +195,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testComplexKeyEvict() throws Exception { - Cache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); + GridCache<GridSpringCacheTestKey, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) c.putx(new GridSpringCacheTestKey(i, "suffix" + i), "value" + i); @@ -219,7 +219,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testEvictAll() throws Exception { - Cache<Integer, String> c = grid().cache(CACHE_NAME); + GridCache<Integer, String> c = grid().cache(CACHE_NAME); for (int i = 0; i < 3; i++) c.putx(i, "value" + i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java index e41e93e..12b38e1 100644 --- a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.spring; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.Cache; +import org.apache.ignite.cache.GridCache; import org.apache.ignite.cache.spring.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -111,7 +111,7 @@ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testCacheAndEvict() throws Exception { - Cache<Object, String> c = grid().cache(DATA_CACHE_NAME); + GridCache<Object, String> c = grid().cache(DATA_CACHE_NAME); assertEquals("value1", svc.cacheable(1)); @@ -132,7 +132,7 @@ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testPutAndEvict() throws Exception { - Cache<Object, String> c = grid().cache(DATA_CACHE_NAME); + GridCache<Object, String> c = grid().cache(DATA_CACHE_NAME); assertEquals("value1", svc.cachePut(1)); @@ -153,7 +153,7 @@ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testCacheAndEvictAll() throws Exception { - Cache<Object, String> c = grid().cache(DATA_CACHE_NAME); + GridCache<Object, String> c = grid().cache(DATA_CACHE_NAME); assertEquals("value1", svc.cacheable(1)); assertEquals("value2", svc.cacheable(2)); @@ -180,7 +180,7 @@ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testPutAndEvictAll() throws Exception { - Cache<Object, String> c = grid().cache(DATA_CACHE_NAME); + GridCache<Object, String> c = grid().cache(DATA_CACHE_NAME); assertEquals("value1", svc.cachePut(1)); assertEquals("value2", svc.cachePut(2)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 50be722..7b99774 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(); - Cache<String, HttpSession> cache = G.ignite().cache(getCacheName()); + GridCache<String, HttpSession> cache = G.ignite().cache(getCacheName()); assertNotNull(cache);
