http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java index a5518cd..e75dce5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java @@ -92,7 +92,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (CacheEntry<Integer, String> e : c.entrySet()) { + for (Entry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -131,7 +131,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (CacheEntry<Integer, String> e : c.entrySet()) { + for (Entry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -160,7 +160,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int start = 2 * 1024 * tid; Iterator<String> it1 = null; - Iterator<CacheEntry<Integer, String>> it2 = null; + Iterator<Entry<Integer, String>> it2 = null; Iterator<Integer> it3 = null; boolean created = false; @@ -211,7 +211,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (CacheEntry<Integer, String> e : c.entrySet()) { + for (Entry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -256,7 +256,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int start = 2 * 1024 * tid; Iterator<String> it1 = null; - Iterator<CacheEntry<Integer, String>> it2 = null; + Iterator<Entry<Integer, String>> it2 = null; Iterator<Integer> it3 = null; boolean forgot = false; @@ -306,7 +306,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (CacheEntry<Integer, String> e : c.entrySet()) { + for (Entry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -343,7 +343,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { @SuppressWarnings("UnusedAssignment") @Override public Object call() throws Exception { Iterator<String> it1 = c.values().iterator(); - Iterator<CacheEntry<Integer, String>> it2 = c.entrySet().iterator(); + Iterator<Entry<Integer, String>> it2 = c.entrySet().iterator(); Iterator<Integer> it3 = c.keySet().iterator(); for (int i = 0; i < 1000; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java index 9cc6f1a..29f6578 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java @@ -76,7 +76,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { cache.put("key" + i, "val" + i); for (int i = 0; i < 20; i++) { - CacheEntry<String, String> entry = cache.randomEntry(); + Entry<String, String> entry = cache.randomEntry(); assert entry != null; @@ -116,7 +116,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (!done.get()) { - CacheEntry<String, String> entry = cache.randomEntry(); + Entry<String, String> entry = cache.randomEntry(); info("Random entry key: " + (entry != null ? entry.getKey() : "N/A")); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index 0a35047..52c4d45 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -713,7 +713,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { CacheAffinityKey<String> affinityKey = new CacheAffinityKey<>(cacheKey, terminalId); - CacheEntry<CacheAffinityKey<String>, Object> entry = cache.entry(affinityKey); + Entry<CacheAffinityKey<String>, Object> entry = cache.entry(affinityKey); entry.setx(o); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index c812d1e..12f5a70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -397,7 +397,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictionFilter(new CacheEvictionFilter<Object, Object>() { - @Override public boolean evictAllowed(CacheEntry<Object, Object> entry) { + @Override public boolean evictAllowed(Entry<Object, Object> entry) { return false; } }); @@ -408,7 +408,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictionFilter(new CacheEvictionFilter<Object, Object>() { - @Override public boolean evictAllowed(CacheEntry<Object, Object> entry) { + @Override public boolean evictAllowed(Entry<Object, Object> entry) { return true; } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index a1fe573..ed1f87d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests from {@link org.apache.ignite.cache.CacheEntry#memorySize()} method. + * Tests from {@link org.apache.ignite.cache.Entry#memorySize()} method. */ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { /** IP finder. */ @@ -270,7 +270,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { * @return Extras size. * @throws Exception If failed. */ - private int extrasSize(CacheEntry entry) throws Exception { + private int extrasSize(Entry entry) throws Exception { Method mthd = GridCacheMapEntry.class.getDeclaredMethod("extrasSize"); mthd.setAccessible(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java index 684c346..43759da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java @@ -84,16 +84,16 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @param prj Projection. * @param c Visitor closure. */ - private void iterate(CacheProjection<Integer, Integer> prj, IgniteInClosure<CacheEntry<Integer, Integer>> c) { + private void iterate(CacheProjection<Integer, Integer> prj, IgniteInClosure<Entry<Integer, Integer>> c) { prj.forEach(c); } /** * @return Empty filter. */ - private IgniteInClosure<CacheEntry<Integer, Integer>> emptyFilter() { - return new CI1<CacheEntry<Integer, Integer>>() { - @Override public void apply(CacheEntry<Integer, Integer> e) { + private IgniteInClosure<Entry<Integer, Integer>> emptyFilter() { + return new CI1<Entry<Integer, Integer>>() { + @Override public void apply(Entry<Integer, Integer> e) { // No-op } }; @@ -110,7 +110,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { assert cache.size() == SMALL_ENTRY_CNT; - IgniteInClosure<CacheEntry<Integer, Integer>> c = emptyFilter(); + IgniteInClosure<Entry<Integer, Integer>> c = emptyFilter(); // Warmup. for (int i = 0; i < 10; i ++) @@ -139,7 +139,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { assert cache.size() == LARGE_ENTRY_CNT; - IgniteInClosure<CacheEntry<Integer, Integer>> c = emptyFilter(); + IgniteInClosure<Entry<Integer, Integer>> c = emptyFilter(); // Warmup. for (int i = 0; i < 3; i++) @@ -168,7 +168,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { assert cache.size() == LARGE_ENTRY_CNT; - IgniteInClosure<CacheEntry<Integer, Integer>> c = emptyFilter(); + IgniteInClosure<Entry<Integer, Integer>> c = emptyFilter(); CacheProjection<Integer, Integer> prj = cache.projection(new P2<Integer, Integer>() { @Override public boolean apply(Integer key, Integer val) { @@ -208,8 +208,8 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { final BoxedInt cnt = new BoxedInt(); - IgniteInClosure<CacheEntry<Integer, Integer>> c = new CI1<CacheEntry<Integer, Integer>>() { - @Override public void apply(CacheEntry<Integer, Integer> t) { + IgniteInClosure<Entry<Integer, Integer>> c = new CI1<Entry<Integer, Integer>>() { + @Override public void apply(Entry<Integer, Integer> t) { if (t.peek() < SMALL_ENTRY_CNT) cnt.increment(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index 652d779..b543a78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -172,7 +172,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, CacheEntry entry) { + @Override public void onEntryAccessed(boolean rmv, Entry entry) { // No-op. } } @@ -187,7 +187,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public boolean evictAllowed(CacheEntry entry) { + @Override public boolean evictAllowed(Entry entry) { return false; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java index 43b18f2..adcd7d8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -166,7 +166,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { assertFalse("Entry is locked after implicit transaction commit: " + entry, entry.lockedByAny()); } - Set<CacheEntry<Object, Object>> entries = cache.entrySet(); + Set<Entry<Object, Object>> entries = cache.entrySet(); assertNotNull(entries); assertFalse(entries.toString().isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java index 096f448..2c1bc7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java @@ -375,9 +375,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend /** * */ - protected static class TestFilter implements IgnitePredicate<CacheEntry<Integer, Integer>> { + protected static class TestFilter implements IgnitePredicate<Entry<Integer, Integer>> { /** {@inheritDoc} */ - @Override public boolean apply(CacheEntry<Integer, Integer> e) { + @Override public boolean apply(Entry<Integer, Integer> e) { if (e == null) { failed = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 0fb3d7d..a7b9847 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -342,7 +342,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { assert val != null; assert val.value() == i; - CacheEntry<Integer, CacheValue> entry = cache.entry(i); + Entry<Integer, CacheValue> entry = cache.entry(i); assert entry != null; @@ -564,7 +564,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { private void checkEntries(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { for (int i = lowerBound; i < upperBound; i++) { - CacheEntry<Integer, CacheValue> entry = cache.entry(i); + Entry<Integer, CacheValue> entry = cache.entry(i); assert entry != null; assert entry.getKey() != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index bf607b4..9743ccf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -615,7 +615,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * */ @SuppressWarnings("PublicInnerClass") - public static class TestEntryPredicate implements IgnitePredicate<CacheEntry<Integer, Integer>> { + public static class TestEntryPredicate implements IgnitePredicate<Entry<Integer, Integer>> { /** */ private Integer expVal; @@ -627,7 +627,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb } /** {@inheritDoc} */ - @Override public boolean apply(CacheEntry<Integer, Integer> e) { + @Override public boolean apply(Entry<Integer, Integer> e) { assertEquals(expVal, e.peek()); return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java index b760af8..3a33d8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java @@ -251,7 +251,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri /** * */ - protected abstract static class TestPredicate implements P1<CacheEntry<Integer, Object>> { + protected abstract static class TestPredicate implements P1<Entry<Integer, Object>> { /** */ protected String expVal; @@ -268,7 +268,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri } /** {@inheritDoc} */ - @Override public final boolean apply(CacheEntry<Integer, Object> e) { + @Override public final boolean apply(Entry<Integer, Object> e) { assertNotNull(e); Object val = e.peek(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java index c9d3fa6..dd5ed6d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java @@ -119,7 +119,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { GridCache<String, Integer> c = grid(i).cache(null); - CacheEntry<String, Integer> e = c.entry(KEY); + Entry<String, Integer> e = c.entry(KEY); if (e.primary()) { info("Primary node: " + grid(i).localNode().id()); @@ -140,7 +140,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { GridCache<String, Integer> c = grid(i).cache(null); - CacheEntry<String, Integer> e = c.entry(KEY); + Entry<String, Integer> e = c.entry(KEY); if (e.backup()) { info("Backup node: " + grid(i).localNode().id()); @@ -173,7 +173,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { GridCache<String, Integer> c = grid(i).cache(null); - CacheEntry<String, Integer> e = c.entry(KEY); + Entry<String, Integer> e = c.entry(KEY); if (!e.primary() && !e.backup()) { info("Near node: " + grid(i).localNode().id()); @@ -221,7 +221,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); - CacheEntry<String, Integer> e = g.<String, Integer>cache(null).entry(KEY); + Entry<String, Integer> e = g.<String, Integer>cache(null).entry(KEY); if (e.primary()) { info("Primary node: " + g.cluster().localNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java index 4fdf767..679712d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java @@ -121,7 +121,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest info("Started evicting..."); for (int i = 0; i < 3000 && !done.get(); i++) { - CacheEntry<Integer, Object> entry = randomEntry(ignite1); + Entry<Integer, Object> entry = randomEntry(ignite1); if (entry != null) entry.evict(); @@ -161,7 +161,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest info("Evicting on constant topology."); for (int i = 0; i < 1000; i++) { - CacheEntry<Integer, Object> entry = randomEntry(ignite1); + Entry<Integer, Object> entry = randomEntry(ignite1); if (entry != null) entry.evict(); @@ -204,7 +204,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest * @param g Grid. * @return Random entry from cache. */ - @Nullable private CacheEntry<Integer, Object> randomEntry(Ignite g) { + @Nullable private Entry<Integer, Object> randomEntry(Ignite g) { IgniteKernal g1 = (IgniteKernal)g; return g1.<Integer, Object>internalCache().randomEntry(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index 6720f4e..dd54640 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -116,7 +116,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** {@inheritDoc} */ - @Nullable @Override public CacheEntry<K, V> evictWrap() { + @Nullable @Override public Entry<K, V> evictWrap() { return null; } @@ -337,12 +337,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public CacheEntry<K, V> wrap(boolean prjAware) { + @Override public Entry<K, V> wrap(boolean prjAware) { assert false; return null; } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { + @Override public Entry<K, V> wrapFilterLocked() throws IgniteCheckedException { assert false; return null; } @@ -368,20 +368,20 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public boolean invalidate(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public boolean invalidate(@Nullable IgnitePredicate<Entry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { assert false; return false; } /** @inheritDoc */ - @Override public boolean compact(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public boolean compact(@Nullable IgnitePredicate<Entry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { assert false; return false; } /** @inheritDoc */ @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { assert false; return false; } @@ -413,20 +413,20 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme UUID subjId, Object transformClo, String taskName, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiryPlc) { return val; } /** @inheritDoc */ - @Override public V innerReload(IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public V innerReload(IgnitePredicate<Entry<K, V>>[] filter) { return val; } /** @inheritDoc */ @Override public GridCacheUpdateTxResult<V> innerSet(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, UUID affNodeId, @Nullable V val, @Nullable byte[] valBytes, boolean writeThrough, boolean retval, long ttl, - boolean evt, boolean metrics, long topVer, IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, + boolean evt, boolean metrics, long topVer, IgnitePredicate<Entry<K, V>>[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) throws IgniteCheckedException, GridCacheEntryRemovedException { return new GridCacheUpdateTxResult<>(true, rawPut(val, ttl)); @@ -442,7 +442,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, boolean intercept, UUID subjId, String taskName) @@ -466,7 +466,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme boolean metrics, boolean primary, boolean checkVer, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, GridDrType drType, long drTtl, long drExpireTime, @@ -490,7 +490,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme /** @inheritDoc */ @Override public GridCacheUpdateTxResult<V> innerRemove(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, UUID affNodeId, boolean writeThrough, boolean retval, boolean evt, boolean metrics, long topVer, - IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId, + IgnitePredicate<Entry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) throws IgniteCheckedException, GridCacheEntryRemovedException { obsoleteVer = ver; @@ -504,7 +504,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme /** @inheritDoc */ @Override public boolean clear(GridCacheVersion ver, boolean readers, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { if (ver == null || ver.equals(this.ver)) { val = null; @@ -586,26 +586,26 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public V peek(GridCachePeekMode mode, IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public V peek(GridCachePeekMode mode, IgnitePredicate<Entry<K, V>>[] filter) { return val; } /** @inheritDoc */ @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode, - IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteInternalTx<K, V> tx) + IgnitePredicate<Entry<K, V>>[] filter, IgniteInternalTx<K, V> tx) throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException { return F.t(val); } /** @inheritDoc */ - @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<Entry<K, V>>[] filter) throws GridCacheEntryRemovedException { return val; } /** @inheritDoc */ @Override public V peekFailFast(GridCachePeekMode mode, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { assert false; return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java index c40d9e4..31648a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java @@ -409,7 +409,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { for (int i = 1; i <= maxKeyValue(); i++) { for (int k = 0; k < 3; k++) { try { - CacheEntry<Integer, String> e1 = null; + Entry<Integer, String> e1 = null; String v1 = null; @@ -426,7 +426,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { v1 = e1.get(); } else { - CacheEntry<Integer, String> e2 = cache.entry(i); + Entry<Integer, String> e2 = cache.entry(i); String v2 = e2.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java index 64243d8..e6a5eab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java @@ -98,9 +98,9 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac int cntr = 0; - Set<CacheEntry<Object, Object>> entries = cache.entrySet(); + Set<Entry<Object, Object>> entries = cache.entrySet(); - for (CacheEntry e : entries) { + for (Entry e : entries) { if (e.getKey() instanceof Integer) cntr++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java index bb96c69..43b35fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java @@ -66,7 +66,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr for (int i = 0; i < entryCnt; i++) cache.put(String.valueOf(i), i); - Collection<CacheEntry<String, Integer>> entries = new ArrayList<>(10_000); + Collection<Entry<String, Integer>> entries = new ArrayList<>(10_000); for (int i = 0; i < 10_000; i++) entries.add(cache.randomEntry()); @@ -75,7 +75,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr startGrid(2); startGrid(3); - for (CacheEntry<String, Integer> entry : entries) + for (Entry<String, Integer> entry : entries) entry.partition(); for (int i = 0; i < entryCnt; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java index 413264e..fbc0a0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -653,8 +653,8 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe assert e != null; - IgnitePredicate<CacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); - IgnitePredicate<CacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); + IgnitePredicate<Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); + IgnitePredicate<Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); String key = e.getKey(); Integer val = e.getValue(); @@ -684,8 +684,8 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe assert e != null; - IgnitePredicate<CacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); - IgnitePredicate<CacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); + IgnitePredicate<Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); + IgnitePredicate<Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); String key = e.getKey(); Integer val = e.getValue(); @@ -720,8 +720,8 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe assert e != null; - IgnitePredicate<CacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); - IgnitePredicate<CacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); + IgnitePredicate<Entry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); + IgnitePredicate<Entry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); String key = e.getKey(); Integer val = e.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 023d576..d0d7e79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -587,13 +587,13 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra for (Integer key : failedKeys) { for (int i = 0; i < dataNodes(); i++) { - CacheEntry<Integer, Integer> cacheEntry = caches.get(i).entry(key); + Entry<Integer, Integer> Entry = caches.get(i).entry(key); UUID nodeId = G.ignite(nodeName(i)).cluster().localNode().id(); - if (!F.eq(cacheEntry.get(), expVals.get(key))) - log.error("key=" + key + ", expVal=" + expVals.get(key) + ", cacheVal=" + cacheEntry.get() + - ", primary=" + cacheEntry.primary() + ", backup=" + cacheEntry.backup() + + if (!F.eq(Entry.get(), expVals.get(key))) + log.error("key=" + key + ", expVal=" + expVals.get(key) + ", cacheVal=" + Entry.get() + + ", primary=" + Entry.primary() + ", backup=" + Entry.backup() + ", nodeId=" + nodeId); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 89686fb..d9b4d62 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -113,7 +113,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac IGNITEs.set(i, startGrid(i)); } - CacheEntry e = cache(i).entry(KEY); + Entry e = cache(i).entry(KEY); assert !e.isLocked() : "Entry is locked for grid [idx=" + i + ", entry=" + e + ']'; } @@ -256,7 +256,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac assert !checkCache.lock(KEY, -1); - CacheEntry e = checkCache.entry(KEY); + Entry e = checkCache.entry(KEY); assert e.isLocked() : "Entry is not locked for grid [idx=" + checkIdx + ", entry=" + e + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index eb1900e..392298d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -211,7 +211,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid cache.reloadAll(map.keySet()); for (Integer key : map.keySet()) { - CacheEntry entry = cache.entry(key); + Entry entry = cache.entry(key); if (entry.primary() || entry.backup() || nearEnabled()) assertEquals(map.get(key), cache.peek(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java index c48e353..badca32 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java @@ -197,7 +197,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { GridCache<Integer, Integer> cache = g2.cache(null); for (int j = 0; j < KEY_CNT; j++) { - CacheEntry<Integer, Integer> entry = cache.entry(j); + Entry<Integer, Integer> entry = cache.entry(j); assert entry != null; @@ -241,7 +241,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { done.set(true); for (int j = 0; j < KEY_CNT; j++) { - CacheEntry<Integer, Integer> entry = cache.entry(j); + Entry<Integer, Integer> entry = cache.entry(j); assert entry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java index 2deebe6..22864df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java @@ -84,10 +84,10 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid for (int i = 0; i < 3; i++) { try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 10)) { - Set<CacheEntry<CacheAffinityKey<Integer>, Integer>> set = + Set<Entry<CacheAffinityKey<Integer>, Integer>> set = cache.entrySet(cache(0).affinity().partition(affinityKey)); - for (CacheEntry<CacheAffinityKey<Integer>, Integer> entry : set) { + for (Entry<CacheAffinityKey<Integer>, Integer> entry : set) { Integer old = entry.get(); if (old != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java index e5d57f1..56b5dc6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java @@ -140,7 +140,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest { for (int i = 0; i < 1000; i++) { key = String.valueOf(i); - CacheEntry<Object, Object> entry = grid(0).cache(null).entry(key); + Entry<Object, Object> entry = grid(0).cache(null).entry(key); if (!entry.primary() && entry.backup()) break; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java index 352faea..93413f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java @@ -191,7 +191,7 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkCache(CacheProjection<Integer, Integer> cache, int key, int expVal) throws Exception { - CacheEntry<Integer, Integer> entry = cache.entry(key); + Entry<Integer, Integer> entry = cache.entry(key); assert F.eq(expVal, entry.getValue()) : "Unexpected cache value [key=" + key + ", expected=" + expVal + ", actual=" + entry.getValue() + ", primary=" + entry.primary() + ", backup=" + entry.backup() + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java index 03a8e2f..f6b5c84 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java @@ -49,7 +49,7 @@ public class GridCachePartitionedEntryLockSelfTest extends GridCacheAbstractSelf cache().put("key", 1); for (int i = 0; i < gridCount(); i++) { - final CacheEntry<String, Integer> e = cache(i).entry("key"); + final Entry<String, Integer> e = cache(i).entry("key"); if (e.backup()) { assert !e.isLocked(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java index 7447370..a6fd61b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java @@ -109,7 +109,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom assert !checkCache.lock(key, -1); - CacheEntry e = checkCache.entry(key); + Entry e = checkCache.entry(key); assert e.isLocked() : "Entry is not locked for grid [idx=" + checkIdx + ", entry=" + e + ']'; } @@ -139,7 +139,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom GridCache<Integer, String> checkCache = cache(checkIdx); - CacheEntry e = checkCache.entry(key); + Entry e = checkCache.entry(key); info("Checking entry: " + e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java index f3ce6fa..d1cb5cd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java @@ -119,12 +119,12 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp if (offheapTiered(nodeCache)) continue; - Set<CacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); + Set<Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part); if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) { Collection<String> cp = new LinkedList<>(vals); - for (CacheEntry<String, Integer> e : partEntrySet) { + for (Entry<String, Integer> e : partEntrySet) { String eKey = e.getKey(); assertTrue("Got unexpected key:" + eKey, cp.contains(eKey)); @@ -163,13 +163,13 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp // First node with this partition will remove first key from partition. if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) { - Set<CacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); + Set<Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part); - Iterator<CacheEntry<String, Integer>> it = partEntrySet.iterator(); + Iterator<Entry<String, Integer>> it = partEntrySet.iterator(); assertTrue(it.hasNext()); - CacheEntry<String, Integer> next = it.next(); + Entry<String, Integer> next = it.next(); deleted.add(next.getKey()); @@ -229,7 +229,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp if (offheapTiered(nodeCache)) continue; - Set<CacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); + Set<Entry<String, Integer>> partEntrySet = nodeCache.entrySet(part); if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) { assertTrue(partEntrySet.contains(nodeCache.entry(key))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java index 9ca86fe..dee9f3f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java @@ -125,7 +125,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes int cnt2 = 0; - for (CacheEntry<Integer, String> e : cache0.entrySet()) { + for (Entry<Integer, String> e : cache0.entrySet()) { assert e.primary() || e.backup(); cnt2++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index c176c43..3731cad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -202,7 +202,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti cache().put("key", 1); for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> e = cache(i).entry("key"); + Entry<String, Integer> e = cache(i).entry("key"); if (e.backup()) { assert cache(i).evict("key") : "Entry was not evicted [idx=" + i + ", entry=" + @@ -234,7 +234,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti GridCache<String, Integer> c = cache(i); - CacheEntry<String, Integer> e = c.entry("key"); + Entry<String, Integer> e = c.entry("key"); if (e.backup()) { assertNull("NEAR_ONLY for cache: " + i, e.peek(F.asList(NEAR_ONLY))); @@ -271,7 +271,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti GridCache<String, Integer> c = cache(i); - CacheEntry<String, Integer> e = c.entry("key"); + Entry<String, Integer> e = c.entry("key"); if (e.backup()) { assert e.peek(F.asList(NEAR_ONLY)) == null; @@ -428,7 +428,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti throws Exception { assert lockingEnabled(); - final CacheEntry<String, Integer> e = cache.entry(key); + final Entry<String, Integer> e = cache.entry(key); info("Entry [e=" + e + ", primary=" + e.primary() + ", backup=" + e.backup() + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java index bd4b673..8543935 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java @@ -110,7 +110,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { GridCache<Integer, Integer> cache = cache(i); - CacheEntry<Integer, Integer> entry = cache.entry(1); + Entry<Integer, Integer> entry = cache.entry(1); if (entry.backup()) { assert entry.peek() == 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java index 11ecb4d..32fb618 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java @@ -271,8 +271,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // Map<String, Integer> pairs = threadPairs(size, idx); // -// GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue(); -// GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue(); +// GridPredicate<Entry<String, Integer>> noPrd = F.cacheNoPeekValue(); +// GridPredicate<Entry<String, Integer>> hasPrd = F.cacheHasPeekValue(); // // for (Map.Entry<String, Integer> pair : pairs.entrySet()) { // assert !cache.containsKey(pair.getKey(), hasPrd); @@ -335,8 +335,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // GridCacheTx tx = cache.txStart(); // -// GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue(); -// GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue(); +// GridPredicate<Entry<String, Integer>> noPrd = F.cacheNoPeekValue(); +// GridPredicate<Entry<String, Integer>> hasPrd = F.cacheHasPeekValue(); // // for (Map.Entry<String, Integer> pair : pairs.entrySet()) { // assert !cache.containsKey(pair.getKey(), hasPrd); @@ -404,8 +404,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // final Map<String, Integer> pairs = threadPairs(size, idx); // -// P1<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() { -// @Override public boolean apply(CacheEntry<String, Integer> e) { +// P1<Entry<String, Integer>> p = new P1<Entry<String, Integer>>() { +// @Override public boolean apply(Entry<String, Integer> e) { // String key = e.getKey(); // // Integer val = pairs.get(key); @@ -476,8 +476,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // final Map<String, Integer> pairs = commonPairs(size); // -// P1<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() { -// @Override public boolean apply(CacheEntry<String, Integer> e) { +// P1<Entry<String, Integer>> p = new P1<Entry<String, Integer>>() { +// @Override public boolean apply(Entry<String, Integer> e) { // return pairs.get(e.getKey()).equals(e.peek()); // } // }; @@ -550,8 +550,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // Map<String, Integer> pairs = threadPairs(size, idx); // -// GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue(); -// GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue(); +// GridPredicate<Entry<String, Integer>> noPrd = F.cacheNoPeekValue(); +// GridPredicate<Entry<String, Integer>> hasPrd = F.cacheHasPeekValue(); // // Collection<String> keys = pairs.keySet(); // Collection<Integer> vals = pairs.values(); @@ -635,8 +635,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // Map<String, Integer> pairs = commonPairs(size); // -// GridPredicate<CacheEntry<String, Integer>> noPrd = F.cacheNoPeekValue(); -// GridPredicate<CacheEntry<String, Integer>> hasPrd = F.cacheHasPeekValue(); +// GridPredicate<Entry<String, Integer>> noPrd = F.cacheNoPeekValue(); +// GridPredicate<Entry<String, Integer>> hasPrd = F.cacheHasPeekValue(); // // Collection<String> keys = pairs.keySet(); // Collection<Integer> vals = pairs.values(); @@ -1020,8 +1020,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // final int min = Collections.min(vals); // -// final GridPredicate<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() { -// @Override public boolean apply(CacheEntry<String, Integer> e) { +// final GridPredicate<Entry<String, Integer>> p = new P1<Entry<String, Integer>>() { +// @Override public boolean apply(Entry<String, Integer> e) { // Integer val = e.peek(); // // return val != null && val >= min; @@ -1065,8 +1065,8 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // // final int min = Collections.min(vals); // -// GridPredicate<CacheEntry<String, Integer>> p = new P1<CacheEntry<String, Integer>>() { -// @Override public boolean apply(CacheEntry<String, Integer> e) { +// GridPredicate<Entry<String, Integer>> p = new P1<Entry<String, Integer>>() { +// @Override public boolean apply(Entry<String, Integer> e) { // Integer val = e.peek(); // // return val != null && val >= min; @@ -1883,7 +1883,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // /** // * Closure for this test. // */ -// private static class GridCacheClosure extends GridInClosure<CacheEntry<String, Integer>> { +// private static class GridCacheClosure extends GridInClosure<Entry<String, Integer>> { // /** 0 - calculates minimum, 1 - maximum, 2 - sum. */ // private int type; // @@ -1907,7 +1907,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // } // // /** {@inheritDoc} */ -// @Override public void apply(CacheEntry<String, Integer> e) { +// @Override public void apply(Entry<String, Integer> e) { // Integer i = e.peek(); // // if (i != null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index cdd77b8..cc61b7e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -158,7 +158,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { cache1.put(1, "val1"); cache1.put(2, "val2"); - CacheEntry<Integer, String> e1 = cache1.entry(1); + Entry<Integer, String> e1 = cache1.entry(1); assert e1 != null; @@ -191,7 +191,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { assertEquals("val1", cache2.peek(1)); assertEquals("val2", cache2.peek(2)); - CacheEntry<Integer, String> e2 = cache2.entry(1); + Entry<Integer, String> e2 = cache2.entry(1); assert e2 != null; assert e2 != e1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index 28b59fb..478a168 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -208,12 +208,12 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb fut.get(); - Collection<CacheEntry<Integer, Integer>> queue = internalQueue(plc); + Collection<Entry<Integer, Integer>> queue = internalQueue(plc); info("Test results [threadCnt=" + threadCnt + ", iterCnt=" + ITERATION_CNT + ", cacheSize=" + cache.size() + ", internalQueueSize" + queue.size() + ", duration=" + (System.currentTimeMillis() - start) + ']'); - for (CacheEntry<Integer, Integer> e : queue) { + for (Entry<Integer, Integer> e : queue) { Integer rmv = cache.remove(e.getKey()); if (rmv == null) @@ -225,7 +225,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb if (!cache.isEmpty()) { boolean zombies = false; - for (CacheEntry<Integer, Integer> e : cache) { + for (Entry<Integer, Integer> e : cache) { U.warn(log, "Zombie entry: " + e); zombies = true; @@ -248,7 +248,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb * @param plc Policy to get queue from. * @return Internal entries collection. */ - private Collection<CacheEntry<Integer, Integer>> internalQueue(CacheEvictionPolicy<?, ?> plc) { + private Collection<Entry<Integer, Integer>> internalQueue(CacheEvictionPolicy<?, ?> plc) { if (plc instanceof CacheFifoEvictionPolicy) { CacheFifoEvictionPolicy<Integer, Integer> plc0 = (CacheFifoEvictionPolicy<Integer, Integer>)plc; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index 56f48a1..06be201 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -151,7 +151,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic * @param c1 Policy collection. * @param c2 Expected list. */ - protected void check(Collection<CacheEntry<String, String>> c1, MockEntry... c2) { + protected void check(Collection<Entry<String, String>> c1, MockEntry... c2) { check(c1, F.asList(c2)); } @@ -183,7 +183,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic * @param c1 Policy collection. * @param c2 Expected list. */ - protected void check(Collection<CacheEntry<String, String>> c1, List<MockEntry> c2) { + protected void check(Collection<Entry<String, String>> c1, List<MockEntry> c2) { assert c1.size() == c2.size() : "Mismatch [actual=" + string(c1) + ", expected=" + string(c2) + ']'; assert c1.containsAll(c2) : "Mismatch [actual=" + string(c1) + ", expected=" + string(c2) + ']'; @@ -191,7 +191,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic int i = 0; // Check order. - for (CacheEntry<String, String> e : c1) + for (Entry<String, String> e : c1) assertEquals(e, c2.get(i++)); } @@ -199,9 +199,9 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic * @param c Collection. * @return String. */ - protected String string(Iterable<? extends CacheEntry> c) { - return "[" + F.fold(c, "", new C2<CacheEntry, String, String>() { - @Override public String apply(CacheEntry e, String b) { + protected String string(Iterable<? extends Entry> c) { + return "[" + F.fold(c, "", new C2<Entry, String, String>() { + @Override public String apply(Entry e, String b) { return b.isEmpty() ? e.getKey().toString() : b + ", " + e.getKey(); } }) + "]]"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java index ffbc85c..c9a7a82 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java @@ -54,7 +54,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { /** Policy. */ private CacheEvictionPolicy<Object, Object> plc = new CacheEvictionPolicy<Object, Object>() { - @Override public void onEntryAccessed(boolean rmv, CacheEntry entry) { + @Override public void onEntryAccessed(boolean rmv, Entry entry) { assert !(entry.peek() instanceof Integer); } }; @@ -217,7 +217,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { private final ConcurrentMap<Object, AtomicInteger> cnts = new ConcurrentHashMap<>(); /** {@inheritDoc} */ - @Override public boolean evictAllowed(CacheEntry<Object, Object> entry) { + @Override public boolean evictAllowed(Entry<Object, Object> entry) { AtomicInteger i = cnts.get(entry.getKey()); if (i == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java index 3ea9090..8803934 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java @@ -169,7 +169,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest /** Eviction policy. */ private static class EvictionPolicy implements CacheEvictionPolicy<Object, Object> { /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, CacheEntry<Object, Object> entry) { + @Override public void onEntryAccessed(boolean rmv, Entry<Object, Object> entry) { touchCnt.incrementAndGet(); entry.evict(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index c6a7823..cd267ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -141,7 +141,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { CacheFifoEvictionPolicy<Integer, Integer> plc0 = (CacheFifoEvictionPolicy<Integer, Integer>) plc; if (!plc0.queue().isEmpty()) { - for (CacheEntry<Integer, Integer> e : plc0.queue()) + for (Entry<Integer, Integer> e : plc0.queue()) U.warn(log, "Policy queue item: " + e); fail("Test failed, see logs for details."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java index 53bf2e9..c410734 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java @@ -33,7 +33,7 @@ import java.util.*; /** * Mock cache entry. */ -public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implements CacheEntry<K, V> { +public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implements Entry<K, V> { /** */ @GridToStringInclude private K key; @@ -160,14 +160,14 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Nullable @Override public V set(V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { // No-op. return null; } /** {@inheritDoc} */ @Nullable @Override public IgniteInternalFuture<V> setAsync(V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { // No-op. return null; } @@ -186,14 +186,14 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Override public boolean setx(V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { // No-op. return false; } /** {@inheritDoc} */ @Nullable @Override public IgniteInternalFuture<Boolean> setxAsync(V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { // No-op. return null; } @@ -248,27 +248,27 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Nullable @Override public V remove( - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { // No-op. return null; } /** {@inheritDoc} */ @Nullable @Override public IgniteInternalFuture<V> removeAsync( - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { // No-op. return null; } /** {@inheritDoc} */ - @Override public boolean removex(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public boolean removex(@Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { // No-op. return false; } /** {@inheritDoc} */ @Nullable @Override public IgniteInternalFuture<Boolean> removexAsync( - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { // No-op. return null; } @@ -292,18 +292,18 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement /** {@inheritDoc} */ @Override public boolean lock(long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return false; } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return new GridFinishedFuture<>(null, false); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public void unlock(IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java index dfd3bd6..8cf4d08 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoEvictionPolicySelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.internal.processors.cache.eviction.*; +import javax.cache.Cache.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; @@ -368,7 +369,7 @@ public class GridCacheFifoEvictionPolicySelfTest extends /** {@inheritDoc} */ @Override protected void checkNearPolicies(int endNearPlcSize) { for (int i = 0; i < gridCnt; i++) - for (CacheEntry<String, String> e : nearPolicy(i).queue()) + for (Entry<String, String> e : nearPolicy(i).queue()) assert !e.isCached() : "Invalid near policy size: " + nearPolicy(i).queue(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java index 60c7504..1f10550 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruEvictionPolicySelfTest.java @@ -414,7 +414,7 @@ public class GridCacheLruEvictionPolicySelfTest extends /** {@inheritDoc} */ @Override protected void checkNearPolicies(int endNearPlcSize) { for (int i = 0; i < gridCnt; i++) - for (CacheEntry<String, String> e : nearPolicy(i).queue()) + for (Entry<String, String> e : nearPolicy(i).queue()) assert !e.isCached() : "Invalid near policy size: " + nearPolicy(i).queue(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java index 7afa392..13cf1e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java @@ -106,8 +106,8 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT grid(0).jcache(null).put(new GridCacheInternalKeyImpl("test"), 1); // I would like to filter from key set all entities which key name is not started with "a_". - IgnitePredicate<CacheEntry<String, Integer>> aPred = new IgnitePredicate<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> entry) { + IgnitePredicate<Entry<String, Integer>> aPred = new IgnitePredicate<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> entry) { cntr.incrementAndGet(); assert entry.getKey() instanceof String;
