http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java index 4ff49d7..3ff7c94 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java @@ -71,7 +71,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @param c Test closure. * @throws Exception In case of error. */ - private void runTest(final IgniteInClosure<GridCache<String, Integer>> c) throws Exception { + private void runTest(final IgniteInClosure<Cache<String, Integer>> c) throws Exception { final IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (true) { @@ -92,7 +92,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); while (!fut1.isDone()) if (guard.get()) @@ -110,7 +110,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws IgniteCheckedException If failed. */ private void checkConsistency() throws IgniteCheckedException { - for (GridCacheEntry<String, Integer> e : cache()) + for (CacheEntry<String, Integer> e : cache()) for (int i = 1; i < gridCount(); i++) { Integer val = cache(i).get(e.getKey()); @@ -151,8 +151,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testContainsKey() throws Exception { - runTest(new CI1<GridCache<String,Integer>>() { - @Override public void apply(GridCache<String, Integer> cache) { + runTest(new CI1<Cache<String,Integer>>() { + @Override public void apply(Cache<String, Integer> cache) { assert cache.containsKey("key" + random()); assert !cache.containsKey("wrongKey"); } @@ -163,8 +163,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testContainsKeyFiltered() throws Exception { - runTest(new CI1<GridCache<String,Integer>>() { - @Override public void apply(GridCache<String, Integer> cache) { + runTest(new CI1<Cache<String,Integer>>() { + @Override public void apply(Cache<String, Integer> cache) { assert cache.projection(F.<String, Integer>cacheHasPeekValue()).containsKey("key"); assert !cache.projection(F.<String, Integer>cacheNoPeekValue()).containsKey("key" + random()); } @@ -175,8 +175,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testContainsValue() throws Exception { - runTest(new CI1<GridCache<String,Integer>>() { - @Override public void apply(GridCache<String, Integer> cache) { + runTest(new CI1<Cache<String,Integer>>() { + @Override public void apply(Cache<String, Integer> cache) { assert cache.containsValue(random()); assert !cache.containsValue(-1); } @@ -187,8 +187,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testContainsValueFiltered() throws Exception { - runTest(new CI1<GridCache<String,Integer>>() { - @Override public void apply(GridCache<String, Integer> cache) { + runTest(new CI1<Cache<String,Integer>>() { + @Override public void apply(Cache<String, Integer> cache) { assert cache.projection(F.<String, Integer>cacheHasPeekValue()).containsValue(random()); assert !cache.projection(F.<String, Integer>cacheNoPeekValue()).containsValue(random()); } @@ -199,10 +199,10 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testForAll() throws Exception { - runTest(new CI1<GridCache<String,Integer>>() { - @Override public void apply(GridCache<String, Integer> cache) { - assert cache.forAll(new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> e) { + runTest(new CI1<Cache<String,Integer>>() { + @Override public void apply(Cache<String, Integer> cache) { + assert cache.forAll(new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> e) { Integer val = e.peek(); return val == null || val <= PUT_CNT; @@ -216,8 +216,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testGet() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd = random(); assert cache.get("key" + rnd) == rnd; @@ -230,8 +230,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testGetAsync() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd = random(); assert cache.getAsync("key" + rnd).get() == rnd; @@ -244,8 +244,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testGetAll() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd1 = random(); int rnd2 = random(); @@ -262,8 +262,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testGetAllAsync() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd1 = random(); int rnd2 = random(); @@ -280,8 +280,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testRemove() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd1 = random(); int rnd2 = random(); @@ -304,8 +304,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testRemoveAsync() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd1 = random(); int rnd2 = random(); @@ -328,8 +328,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testRemoveAll() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd = random(); cache.removeAll(rangeKeys(0, rnd)); @@ -344,12 +344,12 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testRemoveAllFiltered() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { final int rnd = random(); - cache.removeAll(new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> e) { + cache.removeAll(new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> e) { Integer val = e.peek(); return val != null && val < rnd; @@ -366,8 +366,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testRemoveAllAsync() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { int rnd = random(); cache.removeAllAsync(rangeKeys(0, rnd)).get(); @@ -382,12 +382,12 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws Exception In case of error. */ public void testRemoveAllAsyncFiltered() throws Exception { - runTest(new CIX1<GridCache<String,Integer>>() { - @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { + runTest(new CIX1<Cache<String,Integer>>() { + @Override public void applyx(Cache<String, Integer> cache) throws IgniteCheckedException { final int rnd = random(); - cache.removeAllAsync(new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> e) { + cache.removeAllAsync(new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> e) { Integer val = e.peek(); return val != null && val < rnd;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 5a9b6fe..f98e5f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -115,7 +115,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (offHeapValues()) { ccfg.setQueryIndexEnabled(false); - ccfg.setMemoryMode(GridCacheMemoryMode.OFFHEAP_VALUES); + ccfg.setMemoryMode(CacheMemoryMode.OFFHEAP_VALUES); ccfg.setOffHeapMaxMemory(0); } @@ -258,8 +258,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key1", 1); cache().put("key2", 100); - checkProjectionContainsKey(true, "key1", F.<GridCacheEntry<String, Integer>>alwaysTrue()); - checkProjectionContainsKey(false, "key1", F.<GridCacheEntry<String, Integer>>alwaysFalse()); + checkProjectionContainsKey(true, "key1", F.<CacheEntry<String, Integer>>alwaysTrue()); + checkProjectionContainsKey(false, "key1", F.<CacheEntry<String, Integer>>alwaysFalse()); checkProjectionContainsKey(false, "key1", gte100); checkProjectionContainsKey(true, "key2", gte100); } @@ -306,8 +306,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key1", 1); cache().put("key2", 100); - checkProjectionContainsValue(true, 1, F.<GridCacheEntry<String, Integer>>alwaysTrue()); - checkProjectionContainsValue(false, 1, F.<GridCacheEntry<String, Integer>>alwaysFalse()); + checkProjectionContainsValue(true, 1, F.<CacheEntry<String, Integer>>alwaysTrue()); + checkProjectionContainsValue(false, 1, F.<CacheEntry<String, Integer>>alwaysFalse()); checkProjectionContainsValue(false, 1, gte100); checkProjectionContainsValue(true, 100, gte100); } @@ -349,8 +349,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testForAll() throws Exception { - assert cache().forAll(F.<GridCacheEntry<String, Integer>>alwaysTrue()); - assert cache().isEmpty() || !cache().forAll(F.<GridCacheEntry<String, Integer>>alwaysFalse()); + assert cache().forAll(F.<CacheEntry<String, Integer>>alwaysTrue()); + assert cache().isEmpty() || !cache().forAll(F.<CacheEntry<String, Integer>>alwaysFalse()); cache().put("key1", 100); cache().put("key2", 101); @@ -522,7 +522,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testGetAllWithNulls() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> c = new LinkedList<>(); @@ -1512,8 +1512,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; try { - cache().put("key1", 101, F.<GridCacheEntry<String, Integer>>alwaysFalse()); - cache().put("key1", 101, F.<GridCacheEntry<String, Integer>>alwaysTrue()); + cache().put("key1", 101, F.<CacheEntry<String, Integer>>alwaysFalse()); + cache().put("key1", 101, F.<CacheEntry<String, Integer>>alwaysTrue()); // Check inside transaction. assertEquals((Integer)101, cache().get("key1")); @@ -1550,11 +1550,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; try { - assertEquals((Integer)100, cache().put("key1", 101, F.<GridCacheEntry<String, Integer>>alwaysTrue())); + assertEquals((Integer)100, cache().put("key1", 101, F.<CacheEntry<String, Integer>>alwaysTrue())); assertEquals((Integer)101, cache().get("key1")); - cache().put("key1", 102, F.<GridCacheEntry<String, Integer>>alwaysFalse()); + cache().put("key1", 102, F.<CacheEntry<String, Integer>>alwaysFalse()); // Check inside transaction. assertEquals((Integer)101, cache().get("key1")); @@ -1687,7 +1687,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testPutAllWithNulls() throws Exception { - final GridCache<String, Integer> cache = cache(); + final Cache<String, Integer> cache = cache(); { Map<String, Integer> m = new HashMap<>(2); @@ -2489,7 +2489,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testRemoveAllWithNulls() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> c = new LinkedList<>(); @@ -2705,7 +2705,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract public void testReload() throws Exception { String key = "testReload"; - GridCache<String, Integer> cache = primaryCache(key); + Cache<String, Integer> cache = primaryCache(key); assertNull(cache.peek(key)); @@ -2728,7 +2728,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract public void testReloadAsync() throws Exception { String key = "testReloadAsync"; - GridCache<String, Integer> cache = primaryCache(key); + Cache<String, Integer> cache = primaryCache(key); assertNull(cache.get(key)); @@ -2749,7 +2749,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testReloadFiltered() throws Exception { - GridCache<String, Integer> cache = primaryCache("key"); + Cache<String, Integer> cache = primaryCache("key"); assertNull(cache.get("key")); @@ -2769,7 +2769,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testReloadAsyncFiltered() throws Exception { - GridCache<String, Integer> cache = primaryCache("key"); + Cache<String, Integer> cache = primaryCache("key"); assertNull(cache.get("key")); @@ -2789,7 +2789,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testReloadAll() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> keys = primaryKeysForCache(cache, 2); @@ -2847,7 +2847,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testReloadAllAsync() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> keys = primaryKeysForCache(cache, 2); @@ -2908,7 +2908,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testReloadAllFiltered() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> keys = primaryKeysForCache(cache, 3); @@ -2955,7 +2955,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testReloadAllAsyncFiltered() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> keys = primaryKeysForCache(cache, 3); @@ -3004,16 +3004,16 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract public void testRemoveAfterClear() throws Exception { GridEx grid = grid(0); - GridCacheDistributionMode distroMode = grid.cache(null).configuration().getDistributionMode(); + CacheDistributionMode distroMode = grid.cache(null).configuration().getDistributionMode(); - if (distroMode == GridCacheDistributionMode.NEAR_ONLY || distroMode == GridCacheDistributionMode.CLIENT_ONLY) { + if (distroMode == CacheDistributionMode.NEAR_ONLY || distroMode == CacheDistributionMode.CLIENT_ONLY) { if (gridCount() < 2) return; grid = grid(1); } - GridCacheProjection<Integer, Integer> cache = grid.cache(null) + CacheProjection<Integer, Integer> cache = grid.cache(null) .projection(Integer.class, Integer.class); int key = 0; @@ -3052,16 +3052,16 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract public void testRemoveFilteredAfterClear() throws Exception { GridEx grid = grid(0); - GridCacheDistributionMode distroMode = grid.cache(null).configuration().getDistributionMode(); + CacheDistributionMode distroMode = grid.cache(null).configuration().getDistributionMode(); - if (distroMode == GridCacheDistributionMode.NEAR_ONLY || distroMode == GridCacheDistributionMode.CLIENT_ONLY) { + if (distroMode == CacheDistributionMode.NEAR_ONLY || distroMode == CacheDistributionMode.CLIENT_ONLY) { if (gridCount() < 2) return; grid = grid(1); } - GridCacheProjection<Integer, Integer> cache = grid.cache(null); + CacheProjection<Integer, Integer> cache = grid.cache(null); List<Integer> keys = new ArrayList<>(); @@ -3087,8 +3087,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int g = 0; g < gridCount(); g++) { Ignite grid0 = grid(g); - grid0.cache(null).removeAll(new IgnitePredicate<GridCacheEntry<Object,Object>>() { - @Override public boolean apply(GridCacheEntry<Object, Object> e) { + grid0.cache(null).removeAll(new IgnitePredicate<CacheEntry<Object,Object>>() { + @Override public boolean apply(CacheEntry<Object, Object> e) { Object val = e.peek(); return val instanceof Integer && (Integer)val > 0; @@ -3103,7 +3103,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testClear() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> keys = primaryKeysForCache(cache, 3); @@ -3201,7 +3201,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testClearKeys() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); Collection<String> keys = primaryKeysForCache(cache, 3); @@ -3274,14 +3274,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key2", 2); cache().put("key3", 3); - Collection<GridCacheEntry<String, Integer>> entries = new HashSet<>(); + Collection<CacheEntry<String, Integer>> entries = new HashSet<>(); for (int i = 0; i < gridCount(); i++) entries.addAll(cache(i).entrySet()); assertEquals(3, entries.size()); - for (GridCacheEntry<String, Integer> entry : entries) + for (CacheEntry<String, Integer> entry : entries) assert "key1".equals(entry.getKey()) || "key2".equals(entry.getKey()) || "key3".equals(entry.getKey()); } @@ -3378,7 +3378,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (lockingEnabled()) { cache().put("key", 1); - GridCacheEntry<String, Integer> e = cache().entry("key"); + CacheEntry<String, Integer> e = cache().entry("key"); assert e != null; @@ -3434,7 +3434,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (lockingEnabled()) { cache().put("key", 1); - final GridCacheEntry<String, Integer> e = cache().entry("key"); + final CacheEntry<String, Integer> e = cache().entry("key"); assert e != null; @@ -3529,9 +3529,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (node == null) throw new IgniteCheckedException("Failed to map key."); - GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); + Cache<String, Integer> cache = G.ignite(node.id()).cache(null); - final GridCacheEntry<String, Integer> e = cache.entry("key"); + final CacheEntry<String, Integer> e = cache.entry("key"); info("Entry [e=" + e + ", primary=" + e.primary() + ", backup=" + e.backup() + ']'); @@ -3610,8 +3610,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert !cache(i).entry("key2").isLocked(); } - cache().projection(F.<GridCacheEntry<String, Integer>>alwaysFalse()).entry("key1").lock(0); - cache().projection(F.<GridCacheEntry<String, Integer>>alwaysTrue()).entry("key2").lock(0); + cache().projection(F.<CacheEntry<String, Integer>>alwaysFalse()).entry("key1").lock(0); + cache().projection(F.<CacheEntry<String, Integer>>alwaysTrue()).entry("key2").lock(0); boolean passed = false; @@ -3624,7 +3624,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert passed; - cache().unlockAll(F.asList("key1", "key2"), F.<GridCacheEntry<String, Integer>>alwaysTrue()); + cache().unlockAll(F.asList("key1", "key2"), F.<CacheEntry<String, Integer>>alwaysTrue()); for (int i = 0; i < 100; i++) { boolean sleep = false; @@ -3659,8 +3659,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key1", 1); cache().put("key2", 100); - GridCacheEntry<String, Integer> e1 = cache().entry("key1"); - GridCacheEntry<String, Integer> e2 = cache().entry("key2"); + CacheEntry<String, Integer> e1 = cache().entry("key1"); + CacheEntry<String, Integer> e2 = cache().entry("key2"); assert e1 != null; assert e2 != null; @@ -3674,8 +3674,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert e1.isLocked(); assert e2.isLocked(); - e1.unlock(F.<GridCacheEntry<String, Integer>>alwaysFalse()); - e2.unlock(F.<GridCacheEntry<String, Integer>>alwaysTrue()); + e1.unlock(F.<CacheEntry<String, Integer>>alwaysFalse()); + e2.unlock(F.<CacheEntry<String, Integer>>alwaysTrue()); for (int i = 0; i < 100; i++) if (e2.isLocked()) @@ -3686,7 +3686,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert e1.isLocked(); assert !e2.isLocked(); - cache().unlockAll(F.asList("key1", "key2"), F.<GridCacheEntry<String, Integer>>alwaysTrue()); + cache().unlockAll(F.asList("key1", "key2"), F.<CacheEntry<String, Integer>>alwaysTrue()); } } @@ -3744,7 +3744,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testPeek() throws Exception { - GridCache<String, Integer> cache = primaryCache("key"); + Cache<String, Integer> cache = primaryCache("key"); assert cache.peek("key") == null; @@ -3783,7 +3783,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ private void checkPeekTxRemove(IgniteTxConcurrency concurrency) throws Exception { if (txEnabled()) { - GridCache<String, Integer> cache = primaryCache("key"); + Cache<String, Integer> cache = primaryCache("key"); cache.put("key", 1); @@ -3801,7 +3801,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPeekRemove() throws Exception { - GridCache<String, Integer> cache = primaryCache("key"); + Cache<String, Integer> cache = primaryCache("key"); cache.put("key", 1); cache.remove("key"); @@ -3814,11 +3814,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPeekMode() throws Exception { String key = "testPeekMode"; - GridCache<String, Integer> cache = primaryCache(key); + Cache<String, Integer> cache = primaryCache(key); cache.put(key, 1); - GridCacheEntry<String, Integer> entry = cache.entry(key); + CacheEntry<String, Integer> entry = cache.entry(key); assert entry.primary(); @@ -3846,7 +3846,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert entry.peek(F.asList(SMART)) == 1; - GridCacheEntry<String, Integer> ew = cache.entry("wrongKey"); + CacheEntry<String, Integer> ew = cache.entry("wrongKey"); assert cache.peek("wrongKey", F.asList(TX, GLOBAL, SWAP, DB)) == null; @@ -3950,8 +3950,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testPeekFiltered() throws Exception { - GridCache<String, Integer> cache1 = primaryCache("key1"); - GridCache<String, Integer> cache2 = primaryCache("key2"); + Cache<String, Integer> cache1 = primaryCache("key1"); + Cache<String, Integer> cache2 = primaryCache("key2"); cache1.put("key1", 1); cache2.put("key2", 100); @@ -3976,7 +3976,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testEvict() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); List<String> keys = primaryKeysForCache(cache, 2); @@ -4017,7 +4017,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testEvictExpired() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); String key = primaryKeysForCache(cache, 1).get(0); @@ -4025,7 +4025,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get(key)); - GridCacheEntry<String, Integer> entry = cache.entry(key); + CacheEntry<String, Integer> entry = cache.entry(key); assert entry != null; @@ -4066,7 +4066,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPeekExpired() throws Exception { - GridCache<String, Integer> c = cache(); + Cache<String, Integer> c = cache(); String key = primaryKeysForCache(c, 1).get(0); @@ -4096,7 +4096,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPeekExpiredTx() throws Exception { if (txEnabled()) { - GridCache<String, Integer> c = cache(); + Cache<String, Integer> c = cache(); String key = "1"; int ttl = 500; @@ -4149,14 +4149,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); - final GridCache<String, Integer> c = cache(); + final Cache<String, Integer> c = cache(); final String key = primaryKeysForCache(c, 1).get(0); if (oldEntry) c.put(key, 1); - GridCacheEntry<String, Integer> entry = c.entry(key); + CacheEntry<String, Integer> entry = c.entry(key); assert entry != null; @@ -4194,7 +4194,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract long[] expireTimes = new long[gridCount()]; for (int i = 0; i < gridCount(); i++) { - GridCacheEntry<String, Integer> curEntry = cache(i).entry(key); + CacheEntry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4219,7 +4219,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - GridCacheEntry<String, Integer> curEntry = cache(i).entry(key); + CacheEntry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4244,7 +4244,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - GridCacheEntry<String, Integer> curEntry = cache(i).entry(key); + CacheEntry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4273,7 +4273,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract log.info("Put 4 done"); for (int i = 0; i < gridCount(); i++) { - GridCacheEntry<String, Integer> curEntry = cache(i).entry(key); + CacheEntry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4534,7 +4534,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * JUnit. */ public void testCacheProxy() { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); assert cache instanceof GridCacheProxy; } @@ -4545,7 +4545,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testCompactExpired() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); String key = F.first(primaryKeysForCache(cache, 1)); @@ -4636,25 +4636,25 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (txEnabled()) { final int cnt = 10; - CU.inTx(cache(), concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() { + CU.inTx(cache(), concurrency, isolation, new CIX1<CacheProjection<String, Integer>>() { @Override - public void applyx(GridCacheProjection<String, Integer> cache) throws IgniteCheckedException { + public void applyx(CacheProjection<String, Integer> cache) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) assertTrue(cache.putx("key" + i, i)); } }); - CU.inTx(cache(), concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() { + CU.inTx(cache(), concurrency, isolation, new CIX1<CacheProjection<String, Integer>>() { @Override - public void applyx(GridCacheProjection<String, Integer> cache) throws IgniteCheckedException { + public void applyx(CacheProjection<String, Integer> cache) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) assertEquals(new Integer(i), cache.get("key" + i)); } }); - CU.inTx(cache(), concurrency, isolation, new CIX1<GridCacheProjection<String, Integer>>() { + CU.inTx(cache(), concurrency, isolation, new CIX1<CacheProjection<String, Integer>>() { @Override - public void applyx(GridCacheProjection<String, Integer> cache) throws IgniteCheckedException { + public void applyx(CacheProjection<String, Integer> cache) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) assertTrue(cache.removex("key" + i)); } @@ -4772,8 +4772,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(3, primKeys.size()); assertTrue(primKeys.containsAll(keys)); - primKeys = cache(0).projection(new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> e) { + primKeys = cache(0).projection(new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> e) { return !e.getKey().equals(keys.get(0)); } }).primaryKeySet(); @@ -4790,8 +4790,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(3, primVals.size()); assertTrue(primVals.containsAll(F.asList(0, 1, 2))); - primVals = cache(0).projection(new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> e) { + primVals = cache(0).projection(new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> e) { return !e.getKey().equals(keys.get(0)); } }).primaryValues(); @@ -4803,12 +4803,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract // Entry set checks. // ----------------- - Set<GridCacheEntry<String, Integer>> primEntries = cache(0).primaryEntrySet(); + Set<CacheEntry<String, Integer>> primEntries = cache(0).primaryEntrySet(); assertEquals(3, primEntries.size()); - primEntries = cache(0).projection(new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> e) { + primEntries = cache(0).projection(new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> e) { return !e.getKey().equals(keys.get(0)); } }).primaryEntrySet(); @@ -4899,12 +4899,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @param filters Filters. * @return Projection. */ - private GridCacheProjection<String, Integer> projection(GridCacheProjection<String, Integer> cache, - @Nullable IgnitePredicate<GridCacheEntry<String, Integer>>... filters) { - GridCacheProjection<String, Integer> res = cache; + private CacheProjection<String, Integer> projection(CacheProjection<String, Integer> cache, + @Nullable IgnitePredicate<CacheEntry<String, Integer>>... filters) { + CacheProjection<String, Integer> res = cache; if (filters != null) { - for (IgnitePredicate<GridCacheEntry<String, Integer>> filter : filters) + for (IgnitePredicate<CacheEntry<String, Integer>> filter : filters) res = res.projection(filter); } @@ -4940,7 +4940,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ private void checkProjectionContainsKey(boolean exp, String key, - IgnitePredicate<GridCacheEntry<String, Integer>>... f) throws Exception { + IgnitePredicate<CacheEntry<String, Integer>>... f) throws Exception { if (nearEnabled()) assertEquals(exp, projection(cache(), f).containsKey(key)); else { @@ -4990,7 +4990,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ private void checkProjectionContainsValue(boolean exp, Integer val, - IgnitePredicate<GridCacheEntry<String, Integer>>... f) throws Exception { + IgnitePredicate<CacheEntry<String, Integer>>... f) throws Exception { if (nearEnabled()) assertEquals(exp, projection(cache(), f).containsValue(val)); else { @@ -5016,7 +5016,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @return Cache. * @throws Exception If failed. */ - protected GridCache<String, Integer> primaryCache(String key) throws Exception { + protected Cache<String, Integer> primaryCache(String key) throws Exception { ClusterNode node = cache().affinity().mapKeyToNode(key); if (node == null) @@ -5024,7 +5024,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract UUID nodeId = node.id(); - GridCache<String, Integer> cache = null; + Cache<String, Integer> cache = null; for (int i = 0; i < gridCount(); i++) { if (context(i).localNodeId().equals(nodeId)) { @@ -5045,7 +5045,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @return Collection of keys for which given cache is primary. * @throws IgniteCheckedException If failed. */ - protected List<String> primaryKeysForCache(GridCacheProjection<String, Integer> cache, int cnt) + protected List<String> primaryKeysForCache(CacheProjection<String, Integer> cache, int cnt) throws IgniteCheckedException { return primaryKeysForCache(cache, cnt, 1); } @@ -5057,7 +5057,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @return Collection of keys for which given cache is primary. * @throws IgniteCheckedException If failed. */ - protected List<String> primaryKeysForCache(GridCacheProjection<String, Integer> cache, int cnt, int startFrom) + protected List<String> primaryKeysForCache(CacheProjection<String, Integer> cache, int cnt, int startFrom) throws IgniteCheckedException { List<String> found = new ArrayList<>(cnt); @@ -5083,7 +5083,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ protected List<String> primaryKeysForCache(IgniteCache<String, Integer> cache, int cnt) throws IgniteCheckedException { - GridCacheProjection<String, Integer> prj = GridTestUtils.getFieldValue(cache, "delegate"); + CacheProjection<String, Integer> prj = GridTestUtils.getFieldValue(cache, "delegate"); return primaryKeysForCache(prj, cnt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java index b12d664..4c24208 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java @@ -51,7 +51,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra public void testCacheIterator() throws Exception { int cnt = 0; - for (GridCacheEntry<String, Integer> entry : cache()) { + for (CacheEntry<String, Integer> entry : cache()) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -72,7 +72,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra public void testCacheProjectionIterator() throws Exception { int cnt = 0; - for (GridCacheEntry<String, Integer> entry : cache().projection(lt50)) { + for (CacheEntry<String, Integer> entry : cache().projection(lt50)) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -104,7 +104,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra GridTestUtils.runMultiThreaded(new CA() { @Override public void apply() { while (!putFut.isDone()) { - for (GridCacheEntry<String, Integer> entry : cache()) { + for (CacheEntry<String, Integer> entry : cache()) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -118,14 +118,14 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra * @throws Exception If failed. */ public void testEntrySetIterator() throws Exception { - Set<GridCacheEntry<String, Integer>> entries = cache().entrySet(); + Set<CacheEntry<String, Integer>> entries = cache().entrySet(); assert entries != null; assert entries.size() == entryCount(); int cnt = 0; - for (GridCacheEntry<String, Integer> entry : entries) { + for (CacheEntry<String, Integer> entry : entries) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -144,14 +144,14 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra * @throws Exception If failed. */ public void testEntrySetIteratorFiltered() throws Exception { - Set<GridCacheEntry<String, Integer>> entries = cache().projection(lt50).entrySet(); + Set<CacheEntry<String, Integer>> entries = cache().projection(lt50).entrySet(); assert entries != null; assert entries.size() == 50; int cnt = 0; - for (GridCacheEntry<String, Integer> entry : entries) { + for (CacheEntry<String, Integer> entry : entries) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -183,7 +183,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra GridTestUtils.runMultiThreaded(new CA() { @Override public void apply() { while (!putFut.isDone()) { - for (GridCacheEntry<String, Integer> entry : cache().entrySet()) { + for (CacheEntry<String, Integer> entry : cache().entrySet()) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java index b79e62d..fb7c7c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -80,7 +80,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testWritesReads() throws Exception { - GridCache<Integer, Integer> cache0 = grid(0).cache(null); + Cache<Integer, Integer> cache0 = grid(0).cache(null); int keyCnt = keyCount(); @@ -99,7 +99,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract info("Writes: " + cache0.metrics().writes()); for (int j = 0; j < gridCount(); j++) { - GridCache<Integer, Integer> cache = grid(j).cache(null); + Cache<Integer, Integer> cache = grid(j).cache(null); int cacheWrites = cache.metrics().writes(); @@ -118,7 +118,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract long misses = 0; for (int i = 0; i < gridCount(); i++) { - GridCacheMetrics m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); writes += m.writes(); reads += m.reads(); @@ -138,7 +138,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMisses() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); // TODO: GG-7578. if (cache.configuration().getCacheMode() == CacheMode.REPLICATED) @@ -165,7 +165,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract long misses = 0; for (int i = 0; i < gridCount(); i++) { - GridCacheMetrics m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); writes += m.writes(); reads += m.reads(); @@ -183,7 +183,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMissesOnEmptyCache() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); // TODO: GG-7578. if (cache.configuration().getCacheMode() == CacheMode.REPLICATED) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java index 6ac3394..d7bb208 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -29,8 +29,8 @@ import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheFlag.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for custom cache projection (with filters and flags). @@ -58,7 +58,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr cfg.setCacheMode(cacheMode()); cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setPreloadMode(GridCachePreloadMode.SYNC); + cfg.setPreloadMode(CachePreloadMode.SYNC); return cfg; } @@ -72,7 +72,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr * @return Cache instance. */ @SuppressWarnings({"TypeMayBeWeakened"}) - private GridCache<String, TestCloneable> cacheCloneable() { + private Cache<String, TestCloneable> cacheCloneable() { return grid(0).cache(null); } @@ -118,8 +118,8 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr }; /** */ - private IgnitePredicate<GridCacheEntry<String, Integer>> entryFilter = new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> e) { + private IgnitePredicate<CacheEntry<String, Integer>> entryFilter = new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> e) { Integer val = e.peek(); // Let's assume that null values will be passed through, otherwise we won't be able @@ -157,24 +157,24 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr * @throws Exception If check failed. */ private void assertFlagException(Runnable r) throws Exception { - assertException(GridCacheFlagException.class, r); + assertException(CacheFlagException.class, r); } /** * @throws Exception In case of error. */ public void testTypeProjection() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); cache.putAll(F.asMap("k1", 1 , "k2", 2, "k3", 3)); - GridCache<Double, Boolean> anotherCache = grid(0).cache(null); + Cache<Double, Boolean> anotherCache = grid(0).cache(null); assert anotherCache != null; anotherCache.put(3.14, true); - GridCacheProjection<String, Integer> prj = cache.projection(String.class, Integer.class); + CacheProjection<String, Integer> prj = cache.projection(String.class, Integer.class); List<String> keys = F.asList("k1", "k2", "k3"); @@ -186,7 +186,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr * @throws Exception In case of error. */ public void testSize() throws Exception { - GridCacheProjection<String, Integer> prj = cache().projection(kvFilter); + CacheProjection<String, Integer> prj = cache().projection(kvFilter); assert prj.cache() != null; @@ -226,22 +226,22 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr assert cache().containsKey("k"); assert !cache().containsKey("wrongKey"); - GridCacheProjection<String, Integer> prj = cache().projection(kvFilter); + CacheProjection<String, Integer> prj = cache().projection(kvFilter); assert prj.containsKey("key"); assert !prj.containsKey("k"); assert !prj.containsKey("wrongKey"); - assert prj.projection(F.<GridCacheEntry<String, Integer>>alwaysTrue()).containsKey("key"); - assert !prj.projection(F.<GridCacheEntry<String, Integer>>alwaysFalse()).containsKey("key"); - assert !prj.projection(F.<GridCacheEntry<String, Integer>>alwaysFalse()).containsKey("k"); + assert prj.projection(F.<CacheEntry<String, Integer>>alwaysTrue()).containsKey("key"); + assert !prj.projection(F.<CacheEntry<String, Integer>>alwaysFalse()).containsKey("key"); + assert !prj.projection(F.<CacheEntry<String, Integer>>alwaysFalse()).containsKey("k"); } /** * @throws Exception In case of error. */ public void testPut() throws Exception { - final GridCacheProjection<String, Integer> prj = cache().projection(kvFilter); + final CacheProjection<String, Integer> prj = cache().projection(kvFilter); prj.put("key", 1); prj.put("k", 2); @@ -266,9 +266,9 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr * @throws Exception In case of error. */ public void testLocalFlag() throws Exception { - GridCacheProjection<String, Integer> prj = cache().projection(entryFilter); + CacheProjection<String, Integer> prj = cache().projection(entryFilter); - final GridCacheProjection<String, Integer> locPrj = prj.flagsOn(LOCAL); + final CacheProjection<String, Integer> locPrj = prj.flagsOn(LOCAL); prj.put("key", 1); @@ -357,14 +357,14 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr * @throws Exception In case of error. */ public void testEntryLocalFlag() throws Exception { - GridCacheProjection<String, Integer> prj = cache().projection(entryFilter); + CacheProjection<String, Integer> prj = cache().projection(entryFilter); - GridCacheProjection<String, Integer> loc = prj.flagsOn(LOCAL); + CacheProjection<String, Integer> loc = prj.flagsOn(LOCAL); prj.put("key", 1); - GridCacheEntry<String, Integer> prjEntry = prj.entry("key"); - final GridCacheEntry<String, Integer> locEntry = loc.entry("key"); + CacheEntry<String, Integer> prjEntry = prj.entry("key"); + final CacheEntry<String, Integer> locEntry = loc.entry("key"); assert prjEntry != null; assert locEntry != null; @@ -432,9 +432,9 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr * @throws Exception In case of error. */ public void testReadFlag() throws Exception { - GridCacheProjection<String, Integer> prj = cache().projection(entryFilter); + CacheProjection<String, Integer> prj = cache().projection(entryFilter); - final GridCacheProjection<String, Integer> readPrj = prj.flagsOn(READ); + final CacheProjection<String, Integer> readPrj = prj.flagsOn(READ); prj.put("key", 1); @@ -533,7 +533,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr */ @SuppressWarnings({"UnnecessaryFinalOnLocalVariable"}) public void testCloneFlag() throws Exception { - GridCacheProjection<String, TestCloneable> prj = cacheCloneable().flagsOn(CLONE); + CacheProjection<String, TestCloneable> prj = cacheCloneable().flagsOn(CLONE); final TestCloneable val = new TestCloneable("val"); @@ -564,13 +564,13 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr checkClone(vals.iterator().next(), val); - Set<GridCacheEntry<String, TestCloneable>> entries = prj.entrySet(); + Set<CacheEntry<String, TestCloneable>> entries = prj.entrySet(); assertEquals(1, entries.size()); checkClone(entries.iterator().next().getValue(), val); - GridCacheEntry<String, TestCloneable> entry = prj.entry("key"); + CacheEntry<String, TestCloneable> entry = prj.entry("key"); assert entry != null; @@ -586,7 +586,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr GridCacheProxyImpl<String, Integer> prj = (GridCacheProxyImpl<String, Integer>)cache(). flagsOn(CLONE, INVALIDATE); - GridCacheEntry<String, Integer> entry = prj.entry("key"); + CacheEntry<String, Integer> entry = prj.entry("key"); assert entry != null; @@ -657,7 +657,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr assertFalse(cache().containsKey("key")); assertNull(cache().get("key")); - GridCacheProjection<String, Integer> prj = cache().flagsOn(SKIP_SWAP, SKIP_STORE); + CacheProjection<String, Integer> prj = cache().flagsOn(SKIP_SWAP, SKIP_STORE); prj.put("key", 1); @@ -681,7 +681,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr cache().evict("key"); - GridCacheProjection<String, Integer> prj = cache().flagsOn(SKIP_SWAP, SKIP_STORE); + CacheProjection<String, Integer> prj = cache().flagsOn(SKIP_SWAP, SKIP_STORE); assertNull(prj.get("key")); @@ -693,7 +693,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr } /** - * Tests {@link GridCacheFlag#SKIP_SWAP} flag on multiple nodes. + * Tests {@link org.apache.ignite.cache.CacheFlag#SKIP_SWAP} flag on multiple nodes. * * @throws Exception If error occurs. */ @@ -719,7 +719,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr } // Set SKIP_SWAP flag. - GridCacheProjection<Object, Object> cachePrj = grid(0).cache(null).flagsOn(SKIP_SWAP, SKIP_STORE); + CacheProjection<Object, Object> cachePrj = grid(0).cache(null).flagsOn(SKIP_SWAP, SKIP_STORE); // Put new values. for (int i = 1; i <= nEntries; i++) @@ -745,19 +745,19 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr IgniteTx tx = cache().txStart(); - GridCacheProjection<String, Integer> typePrj = cache().projection(String.class, Integer.class); + CacheProjection<String, Integer> typePrj = cache().projection(String.class, Integer.class); typePrj.put("key", 1); typePrj.put("k", 2); - GridCacheProjection<String, Integer> kvFilterPrj = cache().projection(kvFilter); + CacheProjection<String, Integer> kvFilterPrj = cache().projection(kvFilter); Integer one = 1; assertEquals(one, kvFilterPrj.get("key")); assert kvFilterPrj.get("k") == null; - GridCacheProjection<String, Integer> entryFilterPrj = cache().projection(entryFilter); + CacheProjection<String, Integer> entryFilterPrj = cache().projection(entryFilter); assertEquals(one, entryFilterPrj.get("key")); assert entryFilterPrj.get("k") == null; @@ -809,18 +809,18 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr * @throws IgniteCheckedException In case of error. */ public void testTypedProjection() throws Exception { - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); cache.putx("1", "test string"); cache.putx("2", 0); - final GridCacheProjection<String, String> prj = cache.projection(String.class, String.class); + final CacheProjection<String, String> prj = cache.projection(String.class, String.class); final CountDownLatch latch = new CountDownLatch(1); - prj.removeAll(new P1<GridCacheEntry<String, String>>() { + prj.removeAll(new P1<CacheEntry<String, String>>() { @Override - public boolean apply(GridCacheEntry<String, String> e) { + public boolean apply(CacheEntry<String, String> e) { info(" --> " + e.peek().getClass()); latch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 8992d33..2f14c32 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -109,7 +109,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra * @throws Exception If failed. */ public void testPutAndRemove() throws Exception { - final GridCache<Integer, Integer> sndCache0 = grid(0).cache(null); + final Cache<Integer, Integer> sndCache0 = grid(0).cache(null); final AtomicBoolean stop = new AtomicBoolean(); @@ -288,7 +288,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra for (int i = 0; i < GRID_CNT; i++) { Ignite ignite = grid(i); - GridCache<Integer, Integer> cache = ignite.cache(null); + Cache<Integer, Integer> cache = ignite.cache(null); for (Map.Entry<Integer, GridTuple<Integer>> expVal : expVals.entrySet()) { Integer val = cache.get(expVal.getKey()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index 940cf2b..fe2ddc2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -19,6 +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.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -37,16 +38,15 @@ import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Abstract class for cache tests. @@ -115,7 +115,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { // Preloading may happen as nodes leave, so we need to wait. new GridAbsPredicateX() { @Override public boolean applyx() throws IgniteCheckedException { - GridCache<String, Integer> cache = cache(fi); + Cache<String, Integer> cache = cache(fi); cache.removeAll(); @@ -271,14 +271,14 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * @return Partitioned mode. */ - protected GridCacheDistributionMode distributionMode() { + protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } /** * @return Write synchronization. */ - protected GridCacheWriteSynchronizationMode writeSynchronization() { + protected CacheWriteSynchronizationMode writeSynchronization() { return FULL_SYNC; } @@ -297,7 +297,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { return map.get(key); } - @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Object, ? extends Object> e) { map.put(e.getKey(), e.getValue()); } @@ -354,7 +354,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @return Cache instance casted to work with string and integer types for convenience. */ @SuppressWarnings({"unchecked"}) - @Override protected GridCache<String, Integer> cache(int idx) { + @Override protected Cache<String, Integer> cache(int idx) { return grid(idx).cache(null); } @@ -362,7 +362,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @return Default cache instance casted to work with string and integer types for convenience. */ @SuppressWarnings({"unchecked"}) - @Override protected GridCache<String, Integer> cache() { + @Override protected Cache<String, Integer> cache() { return cache(0); } @@ -404,7 +404,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @return {@code True} if cache has OFFHEAP_TIERED memory mode. */ - protected boolean offheapTiered(GridCache cache) { + protected boolean offheapTiered(Cache cache) { return cache.configuration().getMemoryMode() == OFFHEAP_TIERED; } @@ -416,7 +416,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @return Value. * @throws Exception If failed. */ - @Nullable protected <K, V> V peek(GridCacheProjection<K, V> prj, K key) throws Exception { + @Nullable protected <K, V> V peek(CacheProjection<K, V> prj, K key) throws Exception { return offheapTiered(prj.cache()) ? prj.peek(key, F.asList(GridCachePeekMode.SWAP)) : prj.peek(key); } @@ -427,7 +427,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") - protected boolean containsKey(GridCache cache, Object key) throws Exception { + protected boolean containsKey(Cache cache, Object key) throws Exception { return offheapTiered(cache) ? containsOffheapKey(cache, key) : cache.containsKey(key); } @@ -438,7 +438,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") - protected boolean containsValue(GridCache cache, Object val) throws Exception { + protected boolean containsValue(Cache cache, Object val) throws Exception { return offheapTiered(cache) ? containsOffheapValue(cache, val) : cache.containsValue(val); } @@ -449,7 +449,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") - protected boolean containsOffheapKey(GridCache cache, Object key) throws Exception { + protected boolean containsOffheapKey(Cache cache, Object key) throws Exception { for (Iterator<Map.Entry> it = cache.offHeapIterator(); it.hasNext();) { Map.Entry e = it.next(); @@ -467,7 +467,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") - protected boolean containsOffheapValue(GridCache cache, Object val) throws Exception { + protected boolean containsOffheapValue(Cache cache, Object val) throws Exception { for (Iterator<Map.Entry> it = cache.offHeapIterator(); it.hasNext();) { Map.Entry e = it.next(); @@ -481,9 +481,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with keys containing 'key'. */ - protected static IgnitePredicate<GridCacheEntry<String, Integer>> entryKeyFilter = - new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> entry) { + protected static IgnitePredicate<CacheEntry<String, Integer>> entryKeyFilter = + new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> entry) { return entry.getKey().contains("key"); } }; @@ -491,9 +491,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with keys not containing 'key'. */ - protected static IgnitePredicate<GridCacheEntry<String, Integer>> entryKeyFilterInv = - new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> entry) { + protected static IgnitePredicate<CacheEntry<String, Integer>> entryKeyFilterInv = + new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> entry) { return !entry.getKey().contains("key"); } }; @@ -501,9 +501,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with values less than 50. */ - protected static final IgnitePredicate<GridCacheEntry<String, Integer>> lt50 = - new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> entry) { + protected static final IgnitePredicate<CacheEntry<String, Integer>> lt50 = + new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> entry) { Integer i = entry.peek(); return i != null && i < 50; @@ -513,9 +513,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with values greater or equal than 100. */ - protected static final IgnitePredicate<GridCacheEntry<String, Integer>> gte100 = - new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> entry) { + protected static final IgnitePredicate<CacheEntry<String, Integer>> gte100 = + new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> entry) { Integer i = entry.peek(); return i != null && i >= 100; @@ -529,9 +529,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with values greater or equal than 200. */ - protected static final IgnitePredicate<GridCacheEntry<String, Integer>> gte200 = - new P1<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> entry) { + protected static final IgnitePredicate<CacheEntry<String, Integer>> gte200 = + new P1<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> entry) { Integer i = entry.peek(); return i != null && i >= 200; @@ -546,7 +546,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * {@link org.apache.ignite.lang.IgniteInClosure} for calculating sum. */ @SuppressWarnings({"PublicConstructorInNonPublicClass"}) - protected static final class SumVisitor implements CI1<GridCacheEntry<String, Integer>> { + protected static final class SumVisitor implements CI1<CacheEntry<String, Integer>> { /** */ private final AtomicInteger sum; @@ -558,7 +558,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void apply(GridCacheEntry<String, Integer> entry) { + @Override public void apply(CacheEntry<String, Integer> entry) { if (entry.getValue() != null) { Integer i = entry.getValue(); @@ -573,7 +573,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * {@link org.apache.ignite.lang.IgniteReducer} for calculating sum. */ @SuppressWarnings({"PublicConstructorInNonPublicClass"}) - protected static final class SumReducer implements R1<GridCacheEntry<String, Integer>, Integer> { + protected static final class SumReducer implements R1<CacheEntry<String, Integer>, Integer> { /** */ private int sum; @@ -583,7 +583,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public boolean collect(GridCacheEntry<String, Integer> entry) { + @Override public boolean collect(CacheEntry<String, Integer> entry) { if (entry.getValue() != null) { Integer i = entry.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java index 0d68a57..e222d0b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests value read inside transaction. @@ -99,7 +99,7 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT */ protected void checkTransactionalRead(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws IgniteCheckedException { - GridCache<String, Integer> cache = cache(0); + Cache<String, Integer> cache = cache(0); cache.clearAll(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java index 3a2f481..24933cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Affinity API tests. @@ -59,14 +59,14 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { /** * @return Affinity. */ - private GridCacheAffinityFunction affinity() { + private CacheAffinityFunction affinity() { return ((GridKernal)grid(0)).internalCache().configuration().getAffinity(); } /** * @return Affinity mapper. */ - private GridCacheAffinityKeyMapper affinityMapper() { + private CacheAffinityKeyMapper affinityMapper() { return ((GridKernal)grid(0)).internalCache().configuration().getAffinityMapper(); } @@ -96,7 +96,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { * @throws Exception If failed. */ public void testPrimaryPartitionsOneNode() throws Exception { - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); List<List<ClusterNode>> assignment = affinity().assignPartitions(ctx); @@ -138,7 +138,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { assert !F.isEmpty(parts); - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); List<List<ClusterNode>> assignment = affinity().assignPartitions(ctx); @@ -168,7 +168,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { assert !F.isEmpty(parts); - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); List<List<ClusterNode>> assignment = affinity().assignPartitions(ctx); @@ -201,7 +201,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { assert !F.isEmpty(parts); - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); List<List<ClusterNode>> assignment = affinity().assignPartitions(ctx); @@ -223,10 +223,10 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { public void testMapPartitionToNode() throws Exception { int part = RND.nextInt(affinity().partitions()); - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); - GridCacheAffinityFunction aff = affinity(); + CacheAffinityFunction aff = affinity(); List<List<ClusterNode>> assignment = aff.assignPartitions(ctx); @@ -241,10 +241,10 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { public void testMapPartitionsToNode() throws Exception { Map<Integer, ClusterNode> map = cache().affinity().mapPartitionsToNodes(F.asList(0, 1, 5, 19, 12)); - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); - GridCacheAffinityFunction aff = affinity(); + CacheAffinityFunction aff = affinity(); List<List<ClusterNode>> assignment = aff.assignPartitions(ctx); @@ -260,10 +260,10 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { public void testMapPartitionsToNodeArray() throws Exception { Map<Integer, ClusterNode> map = cache().affinity().mapPartitionsToNodes(F.asList(0, 1, 5, 19, 12)); - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); - GridCacheAffinityFunction aff = affinity(); + CacheAffinityFunction aff = affinity(); List<List<ClusterNode>> assignment = aff.assignPartitions(ctx); @@ -284,10 +284,10 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { Map<Integer, ClusterNode> map = cache().affinity().mapPartitionsToNodes(parts); - GridCacheAffinityFunctionContext ctx = + CacheAffinityFunctionContext ctx = new GridCacheAffinityFunctionContextImpl(new ArrayList<>(grid(0).nodes()), null, null, 1, 1); - GridCacheAffinityFunction aff = affinity(); + CacheAffinityFunction aff = affinity(); List<List<ClusterNode>> assignment = aff.assignPartitions(ctx); @@ -312,7 +312,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { * @param key Affinity key. * @return Affinity nodes. */ - private Iterable<ClusterNode> nodes(List<List<ClusterNode>> assignment, GridCacheAffinityFunction aff, Object key) { + private Iterable<ClusterNode> nodes(List<List<ClusterNode>> assignment, CacheAffinityFunction aff, Object key) { return assignment.get(aff.partition(key)); } @@ -330,7 +330,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { for (int kv = 0; kv < keyCnt; kv++) { String key = String.valueOf(kv); - GridCacheEntry<String, Integer> entry = cache().entry(key); + CacheEntry<String, Integer> entry = cache().entry(key); assert entry != null; @@ -342,7 +342,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { * @throws Exception If failed. */ public void testPartitionWithAffinityMapper() throws Exception { - GridCacheAffinityKey<Integer> key = new GridCacheAffinityKey<>(1, 2); + CacheAffinityKey<Integer> key = new CacheAffinityKey<>(1, 2); int expPart = affinity().partition(affinityMapper().affinityKey(key));
