http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index 7059e47..fee7183 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -37,8 +37,8 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -69,7 +69,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(false); cacheCfg.setEvictSynchronized(true); cacheCfg.setEvictNearSynchronized(true); @@ -81,8 +81,8 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT // Set eviction queue size explicitly. cacheCfg.setEvictSynchronizedKeyBufferSize(1); cacheCfg.setEvictMaxOverflowRatio(0); - cacheCfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(10)); - cacheCfg.setNearEvictionPolicy(new GridCacheFifoEvictionPolicy(10)); + cacheCfg.setEvictionPolicy(new CacheFifoEvictionPolicy(10)); + cacheCfg.setNearEvictionPolicy(new CacheFifoEvictionPolicy(10)); cfg.setCacheConfiguration(cacheCfg); @@ -167,8 +167,8 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT * @param idx Index. * @return Affinity. */ - private GridCacheConsistentHashAffinityFunction affinity(int idx) { - return (GridCacheConsistentHashAffinityFunction)grid(idx).cache(null).configuration().getAffinity(); + private CacheConsistentHashAffinityFunction affinity(int idx) { + return (CacheConsistentHashAffinityFunction)grid(idx).cache(null).configuration().getAffinity(); } /** @@ -176,7 +176,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT * @return Primary node for the given key. */ private Collection<ClusterNode> keyNodes(Object key) { - GridCacheConsistentHashAffinityFunction aff = affinity(0); + CacheConsistentHashAffinityFunction aff = affinity(0); return aff.nodes(aff.partition(key), grid(0).nodes(), 1); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java index ce5825a..fab65a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java @@ -38,8 +38,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -71,7 +71,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setPreloadMode(NONE); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(false); cacheCfg.setEvictSynchronized(true); cacheCfg.setEvictNearSynchronized(true); @@ -82,8 +82,8 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { // Set eviction queue size explicitly. cacheCfg.setEvictMaxOverflowRatio(0); cacheCfg.setEvictSynchronizedKeyBufferSize(1); - cacheCfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(10000)); - cacheCfg.setNearEvictionPolicy(new GridCacheFifoEvictionPolicy(10000)); + cacheCfg.setEvictionPolicy(new CacheFifoEvictionPolicy(10000)); + cacheCfg.setNearEvictionPolicy(new CacheFifoEvictionPolicy(10000)); cfg.setCacheConfiguration(cacheCfg); @@ -161,8 +161,8 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { * @param idx Index. * @return Affinity. */ - private GridCacheConsistentHashAffinityFunction affinity(int idx) { - return (GridCacheConsistentHashAffinityFunction)grid(idx).cache(null).configuration().getAffinity(); + private CacheConsistentHashAffinityFunction affinity(int idx) { + return (CacheConsistentHashAffinityFunction)grid(idx).cache(null).configuration().getAffinity(); } /** @@ -170,7 +170,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { * @return Primary node for the given key. */ private Collection<ClusterNode> keyNodes(Object key) { - GridCacheConsistentHashAffinityFunction aff = affinity(0); + CacheConsistentHashAffinityFunction aff = affinity(0); return aff.nodes(aff.partition(key), grid(0).nodes(), 1); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java index cd092f1..3b78325 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Test cache closure execution. @@ -57,7 +57,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes cc.setName("test"); cc.setCacheMode(CacheMode.PARTITIONED); cc.setDefaultTimeToLive(0); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(PARTITIONED_ONLY); @@ -100,7 +100,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ private void checkNodes(Ignite g) throws Exception { - GridCache<String, String> cache = g.cache("test"); + Cache<String, String> cache = g.cache("test"); for (char c = 'a'; c <= 'z'; c++) { String key = Character.toString(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtExpiredEntriesPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtExpiredEntriesPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtExpiredEntriesPreloadSelfTest.java index dfc398c..ce13eb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtExpiredEntriesPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtExpiredEntriesPreloadSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests preloading of expired entries. @@ -33,7 +33,7 @@ public class GridCacheDhtExpiredEntriesPreloadSelfTest extends GridCacheExpiredE } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java index baf597b..60cf7d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java @@ -38,7 +38,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Tests for internal DHT entry. @@ -67,10 +67,10 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setPreloadMode(SYNC); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 2)); + cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 2)); cacheCfg.setBackups(0); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setDistributionMode(GridCacheDistributionMode.NEAR_PARTITIONED); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED); cacheCfg.setNearEvictionPolicy(new GridCacheAlwaysEvictionPolicy()); cacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -97,7 +97,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { ClusterNode other = nodes.get2(); // Create on non-primary node. - GridCacheAtomicLong l = grid(other).cache(null).dataStructures().atomicLong(ATOMIC_LONG_NAME, 1, true); + CacheAtomicLong l = grid(other).cache(null).dataStructures().atomicLong(ATOMIC_LONG_NAME, 1, true); assert l != null; assert l.get() == 1; @@ -196,7 +196,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest { * @return Pair {primary node, some other node}. */ private IgniteBiTuple<ClusterNode, ClusterNode> getNodes(String key) { - GridCacheAffinity<Object> aff = grid(0).cache(null).affinity(); + CacheAffinity<Object> aff = grid(0).cache(null).affinity(); ClusterNode primary = aff.mapKeyToNode(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java index 7c353f6..380d51f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java @@ -29,8 +29,8 @@ import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Tests dht mapping. @@ -49,7 +49,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest { CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setPreloadMode(SYNC); cacheCfg.setBackups(BACKUPS); cacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -78,7 +78,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest { startGridsMultiThreaded(nodeCnt); - GridCache<Integer, Integer> cache = grid(nodeCnt - 1).cache(null); + Cache<Integer, Integer> cache = grid(nodeCnt - 1).cache(null); int kv = 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java index a9e825a..89af5cd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java @@ -55,14 +55,14 @@ public class GridCacheDhtMultiBackupTest extends GridCommonAbstractTest { @Override public void applyx() throws IgniteCheckedException { X.println("Checking whether cache is empty."); - GridCache<SampleKey, SampleValue> cache = g.cache("partitioned"); + Cache<SampleKey, SampleValue> cache = g.cache("partitioned"); assert cache.isEmpty(); } } ); - GridCache<SampleKey, SampleValue> cache = g.cache("partitioned"); + Cache<SampleKey, SampleValue> cache = g.cache("partitioned"); int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java index 516fa02..21dcc85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java @@ -31,8 +31,8 @@ import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheConfiguration.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test large cache counts. @@ -54,7 +54,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { private int backups = DFLT_BACKUPS; /** Preload mode. */ - private GridCachePreloadMode preloadMode = ASYNC; + private CachePreloadMode preloadMode = ASYNC; /** */ private int preloadBatchSize = DFLT_BATCH_SIZE; @@ -85,7 +85,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { cc.setPreloadBatchSize(preloadBatchSize); cc.setWriteSynchronizationMode(FULL_SYNC); cc.setPreloadMode(preloadMode); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cc.setBackups(backups); TcpDiscoverySpi disco = new TcpDiscoverySpi(); @@ -138,7 +138,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { Thread.sleep(10000); for (int i = 0; i < gridCnt; i++) { - GridCache<Integer, String> c = grid(i).cache(null); + Cache<Integer, String> c = grid(i).cache(null); if (backups + 1 <= gridCnt) assert c.size() < cnt : "Cache size: " + c.size(); @@ -167,7 +167,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { if (evt == LifecycleEventType.AFTER_GRID_START) { - GridCache<Integer, byte[]> c = ignite.cache(null); + Cache<Integer, byte[]> c = ignite.cache(null); if (c.putxIfAbsent(-1, new byte[1])) { populate(c, cnt, KBSIZE); @@ -189,7 +189,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { Thread.sleep(10000); for (int i = 0; i < gridCnt; i++) { - GridCache<Integer, String> c = grid(i).cache(null); + Cache<Integer, String> c = grid(i).cache(null); if (backups + 1 <= gridCnt) assert c.size() < cnt; @@ -208,7 +208,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest { * @param kbSize Size in KB. * @throws IgniteCheckedException If failed. */ - private void populate(GridCache<Integer, byte[]> c, int cnt, int kbSize) throws IgniteCheckedException { + private void populate(Cache<Integer, byte[]> c, int cnt, int kbSize) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, value(kbSize)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 0d6c622..388b757 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -41,8 +41,8 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader}. @@ -58,7 +58,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { private static final int PRELOAD_DELAY = 5000; /** Preload mode. */ - private GridCachePreloadMode preloadMode = ASYNC; + private CachePreloadMode preloadMode = ASYNC; /** Preload delay. */ private long delay = -1; @@ -75,10 +75,10 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setPreloadMode(preloadMode); cc.setPreloadPartitionedDelay(delay); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 128)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 128)); cc.setBackups(1); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); @@ -107,7 +107,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - GridCache<String, Integer> c0 = g0.cache(null); + Cache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -115,8 +115,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - GridCache<String, Integer> c1 = g1.cache(null); - GridCache<String, Integer> c2 = g2.cache(null); + Cache<String, Integer> c1 = g1.cache(null); + Cache<String, Integer> c2 = g2.cache(null); for (int i = 0; i < cnt; i++) assertNull(c1.peek(Integer.toString(i))); @@ -184,7 +184,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { int cnt = KEY_CNT; - GridCache<String, Integer> c0 = g0.cache(null); + Cache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -192,8 +192,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - GridCache<String, Integer> c1 = g1.cache(null); - GridCache<String, Integer> c2 = g2.cache(null); + Cache<String, Integer> c1 = g1.cache(null); + Cache<String, Integer> c2 = g2.cache(null); for (int i = 0; i < cnt; i++) assertNull(c1.peek(Integer.toString(i))); @@ -248,13 +248,13 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testAutomaticPreload() throws Exception { delay = 0; - preloadMode = GridCachePreloadMode.SYNC; + preloadMode = CachePreloadMode.SYNC; Ignite g0 = startGrid(0); int cnt = KEY_CNT; - GridCache<String, Integer> c0 = g0.cache(null); + Cache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -262,8 +262,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - GridCache<String, Integer> c1 = g1.cache(null); - GridCache<String, Integer> c2 = g2.cache(null); + Cache<String, Integer> c1 = g1.cache(null); + Cache<String, Integer> c2 = g2.cache(null); GridDhtCacheAdapter<String, Integer> d0 = dht(0); GridDhtCacheAdapter<String, Integer> d1 = dht(1); @@ -325,7 +325,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testManualPreloadSyncMode() throws Exception { - preloadMode = GridCachePreloadMode.SYNC; + preloadMode = CachePreloadMode.SYNC; delay = -1; try { @@ -376,7 +376,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { * @param g Grid. * @return Affinity. */ - private GridCacheAffinity<Object> affinity(Ignite g) { + private CacheAffinity<Object> affinity(Ignite g) { return g.cache(null).affinity(); } @@ -395,7 +395,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { * @param c Cache. * @param keyCnt Key count. */ - private void checkCache(GridCache<String, Integer> c, int keyCnt) { + private void checkCache(Cache<String, Integer> c, int keyCnt) { Ignite g = c.gridProjection().ignite(); for (int i = 0; i < keyCnt; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java index 3e2a3d0..14221ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java @@ -37,8 +37,8 @@ import java.util.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -80,9 +80,9 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_ASYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC); cacheCfg.setPreloadMode(NONE); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cacheCfg.setBackups(backups); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); @@ -172,7 +172,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest try { Ignite ignite1 = startGrid(0); - GridCache<Integer, String> cache1 = ignite1.cache(null); + Cache<Integer, String> cache1 = ignite1.cache(null); int keyCnt = 10; @@ -193,7 +193,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite g : ignites) { - GridCache<Integer, String> c = g.cache(null); + Cache<Integer, String> c = g.cache(null); for (int i = 0; i < keyCnt; i++) assertNull(c.peek(i)); @@ -217,7 +217,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite gg : ignites) { - GridCache<Integer, String> c = gg.cache(null); + Cache<Integer, String> c = gg.cache(null); for (int i = 0; i < keyCnt; i++) assertNull(c.peek(i)); @@ -271,7 +271,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest * @param cnt Key count. * @throws IgniteCheckedException If failed. */ - private void putKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException { + private void putKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, Integer.toString(i)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java index aefc6ed..9264c43 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java @@ -37,7 +37,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader}. @@ -51,7 +51,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest private static final int KEY_CNT = 1000; /** Preload mode. */ - private GridCachePreloadMode preloadMode = GridCachePreloadMode.SYNC; + private CachePreloadMode preloadMode = CachePreloadMode.SYNC; /** IP finder. */ private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -67,7 +67,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest cc.setCacheMode(PARTITIONED); cc.setWriteSynchronizationMode(FULL_SYNC); cc.setPreloadMode(preloadMode); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 521)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 521)); cc.setBackups(1); TcpDiscoverySpi disco = new TcpDiscoverySpi(); @@ -96,7 +96,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest int cnt = KEY_CNT; - GridCache<String, Integer> c0 = g0.cache(null); + Cache<String, Integer> c0 = g0.cache(null); for (int i = 0; i < cnt; i++) c0.put(Integer.toString(i), i); @@ -106,8 +106,8 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest U.sleep(1000); - GridCache<String, Integer> c1 = g1.cache(null); - GridCache<String, Integer> c2 = g2.cache(null); + Cache<String, Integer> c1 = g1.cache(null); + Cache<String, Integer> c2 = g2.cache(null); TestCommunicationSpi spi0 = (TestCommunicationSpi)g0.configuration().getCommunicationSpi(); TestCommunicationSpi spi1 = (TestCommunicationSpi)g1.configuration().getCommunicationSpi(); @@ -126,7 +126,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest * @param c Cache. * @param keyCnt Key count. */ - private void checkCache(GridCache<String, Integer> c, int keyCnt) { + private void checkCache(Cache<String, Integer> c, int keyCnt) { Ignite g = c.gridProjection().ignite(); for (int i = 0; i < keyCnt; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java index 43948c9..edaad78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java @@ -163,7 +163,7 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract for (CacheConfiguration cCfg : cfg.getCacheConfiguration()) { if (cCfg.getCacheMode() == CacheMode.PARTITIONED) { - cCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(2048, null)); + cCfg.setAffinity(new CacheConsistentHashAffinityFunction(2048, null)); cCfg.setBackups(1); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java index c1a9663..67c8c7a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader} with off-heap value storage. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 bb8e54d..24b63df 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 @@ -33,8 +33,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader}. @@ -57,7 +57,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { private int backups; /** Preload mode. */ - private GridCachePreloadMode preloadMode; + private CachePreloadMode preloadMode; /** IP finder. */ private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -194,10 +194,10 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < ITER_CNT; i++) { info("Iteration # " + i); - GridCache<Integer, Integer> cache = g2.cache(null); + Cache<Integer, Integer> cache = g2.cache(null); for (int j = 0; j < KEY_CNT; j++) { - GridCacheEntry<Integer, Integer> entry = cache.entry(j); + CacheEntry<Integer, Integer> entry = cache.entry(j); assert entry != null; @@ -229,7 +229,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { Ignite g1 = startGrid(1); - GridCache<Integer, Integer> cache = g1.cache(null); + Cache<Integer, Integer> cache = g1.cache(null); for (int j = 0; j < KEY_CNT; j++) { cache.put(j, j); @@ -241,7 +241,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { done.set(true); for (int j = 0; j < KEY_CNT; j++) { - GridCacheEntry<Integer, Integer> entry = cache.entry(j); + CacheEntry<Integer, Integer> entry = cache.entry(j); assert entry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 3934f17..e04983d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -39,8 +39,8 @@ import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheConfiguration.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; /** @@ -66,7 +66,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { private int backups = DFLT_BACKUPS; /** Preload mode. */ - private GridCachePreloadMode preloadMode = ASYNC; + private CachePreloadMode preloadMode = ASYNC; /** */ private int preloadBatchSize = DFLT_BATCH_SIZE; @@ -112,7 +112,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { cacheCfg.setPreloadBatchSize(preloadBatchSize); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setPreloadMode(preloadMode); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cacheCfg.setBackups(backups); return cacheCfg; @@ -145,7 +145,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { * @return Affinity. */ @SuppressWarnings({"unchecked"}) - private GridCacheAffinity<Integer> affinity(GridCache<Integer, ?> cache) { + private CacheAffinity<Integer> affinity(Cache<Integer, ?> cache) { return cache.affinity(); } @@ -153,7 +153,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { * @param c Cache. * @return {@code True} if synchronous preloading. */ - private boolean isSync(GridCache<?, ?> c) { + private boolean isSync(Cache<?, ?> c) { return c.configuration().getPreloadMode() == SYNC; } @@ -223,7 +223,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { try { Ignite ignite1 = startGrid(0); - GridCache<Integer, String> cache1 = ignite1.cache(null); + Cache<Integer, String> cache1 = ignite1.cache(null); putKeys(cache1, keyCnt); checkKeys(cache1, keyCnt, F.asList(ignite1)); @@ -234,7 +234,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all nodes. for (Ignite g : ignites) { - GridCache<Integer, String> c = g.cache(null); + Cache<Integer, String> c = g.cache(null); checkKeys(c, keyCnt, ignites); } @@ -305,11 +305,11 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { assert last != null; - GridCache<Integer, String> lastCache = last.cache(null); + Cache<Integer, String> lastCache = last.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(lastCache); - GridCacheAffinity<Integer> aff = affinity(lastCache); + CacheAffinity<Integer> aff = affinity(lastCache); info("Finished waiting for all exchange futures..."); @@ -346,7 +346,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { private void checkActiveState(Iterable<Ignite> grids) { // Check that nodes don't have non-active information about other nodes. for (Ignite g : grids) { - GridCache<Integer, String> c = g.cache(null); + Cache<Integer, String> c = g.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(c); @@ -489,7 +489,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { try { Ignite ignite1 = startGrid(0); - GridCache<Integer, String> cache1 = ignite1.cache(null); + Cache<Integer, String> cache1 = ignite1.cache(null); putKeys(cache1, keyCnt); checkKeys(cache1, keyCnt, F.asList(ignite1)); @@ -500,7 +500,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all nodes. for (Ignite g : ignites) { - GridCache<Integer, String> c = g.cache(null); + Cache<Integer, String> c = g.cache(null); checkKeys(c, keyCnt, ignites); } @@ -563,7 +563,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all left nodes. for (Ignite gg : ignites) { - GridCache<Integer, String> c = gg.cache(null); + Cache<Integer, String> c = gg.cache(null); checkKeys(c, keyCnt, ignites); } @@ -571,11 +571,11 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { assert last != null; - GridCache<Integer, String> lastCache = last.cache(null); + Cache<Integer, String> lastCache = last.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(lastCache); - GridCacheAffinity<Integer> aff = affinity(lastCache); + CacheAffinity<Integer> aff = affinity(lastCache); for (int i = 0; i < keyCnt; i++) { if (aff.mapPartitionToPrimaryAndBackups(aff.partition(i)).contains(last.cluster().localNode())) { @@ -607,7 +607,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { * @param cnt Key count. * @throws IgniteCheckedException If failed. */ - private void putKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException { + private void putKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, Integer.toString(i)); } @@ -618,8 +618,8 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { * @param grids Grids. * @throws IgniteCheckedException If failed. */ - private void checkKeys(GridCache<Integer, String> cache, int cnt, Iterable<Ignite> grids) throws IgniteCheckedException { - GridCacheAffinity<Integer> aff = affinity(cache); + private void checkKeys(Cache<Integer, String> cache, int cnt, Iterable<Ignite> grids) throws IgniteCheckedException { + CacheAffinity<Integer> aff = affinity(cache); Ignite ignite = cache.gridProjection().ignite(); @@ -660,7 +660,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { Map<String, String> map = new HashMap<>(); for (Ignite g : grids) { - GridCache<Integer, String> c = g.cache(null); + Cache<Integer, String> c = g.cache(null); GridDhtCacheAdapter<Integer, String> dht = dht(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java index 3d11172..fee1c54 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheConfiguration.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; /** @@ -63,7 +63,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest private int backups = DFLT_BACKUPS; /** Preload mode. */ - private GridCachePreloadMode preloadMode = ASYNC; + private CachePreloadMode preloadMode = ASYNC; /** */ private int preloadBatchSize = DFLT_BATCH_SIZE; @@ -97,9 +97,9 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setPreloadBatchSize(preloadBatchSize); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setPreloadMode(preloadMode); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cacheCfg.setBackups(backups); cacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -135,7 +135,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest * @param cache Cache. * @return Affinity. */ - private GridCacheAffinity<Integer> affinity(GridCache<Integer, ?> cache) { + private CacheAffinity<Integer> affinity(Cache<Integer, ?> cache) { return cache.affinity(); } @@ -143,7 +143,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest * @param c Cache. * @return {@code True} if synchronoous preloading. */ - private boolean isSync(GridCache<?, ?> c) { + private boolean isSync(Cache<?, ?> c) { return c.configuration().getPreloadMode() == SYNC; } @@ -188,7 +188,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest try { Ignite g1 = startGrid(0); - GridCache<Integer, String> c1 = g1.cache(null); + Cache<Integer, String> c1 = g1.cache(null); putKeys(c1, keyCnt); checkKeys(c1, keyCnt); @@ -199,7 +199,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest // Check all nodes. for (Ignite g : ignites) { - GridCache<Integer, String> c = g.cache(null); + Cache<Integer, String> c = g.cache(null); checkKeys(c, keyCnt); } @@ -219,7 +219,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest for (IgniteFuture<?> fut : exchMgr.exchangeFutures()) fut.get(); - GridCacheAffinity<Integer> aff = affinity(c1); + CacheAffinity<Integer> aff = affinity(c1); for (int i = 0; i < keyCnt; i++) { if (aff.mapPartitionToPrimaryAndBackups(aff.partition(i)).contains(g1.cluster().localNode())) { @@ -240,7 +240,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest * @param cnt Key count. * @throws IgniteCheckedException If failed. */ - private void putKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException { + private void putKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, Integer.toString(i)); } @@ -250,8 +250,8 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest * @param cnt Key count. * @throws IgniteCheckedException If failed. */ - private void checkKeys(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException { - GridCacheAffinity<Integer> aff = affinity(c); + private void checkKeys(Cache<Integer, String> c, int cnt) throws IgniteCheckedException { + CacheAffinity<Integer> aff = affinity(c); boolean sync = isSync(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java index 7ea298c..b3817e0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java @@ -32,7 +32,7 @@ import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheConfiguration.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Test large cache counts. @@ -52,7 +52,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { private int backups = DFLT_BACKUPS; /** Preload mode. */ - private GridCachePreloadMode preloadMode = ASYNC; + private CachePreloadMode preloadMode = ASYNC; /** */ private int preloadBatchSize = DFLT_BATCH_SIZE; @@ -84,9 +84,9 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { cc.setCacheMode(PARTITIONED); cc.setPreloadBatchSize(preloadBatchSize); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setPreloadMode(preloadMode); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cc.setBackups(backups); cc.setAtomicityMode(TRANSACTIONAL); @@ -170,7 +170,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { info("Grid size [i=" + i + ", size=" + grid(i).cache(null).size() + ']'); for (int i = 0; i < gridCnt; i++) { - GridCache<Integer, String> c = grid(i).cache(null); + Cache<Integer, String> c = grid(i).cache(null); // Nothing should be unloaded since nodes are backing up each other. assert c.size() == cnt; @@ -197,7 +197,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { boolean err = false; for (int i = 0; i < gridCnt; i++) { - GridCache<Integer, String> c = grid(i).cache(null); + Cache<Integer, String> c = grid(i).cache(null); if (c.size() >= cnt) err = true; @@ -213,7 +213,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { info("Grid size [i=" + i + ", size=" + grid(i).cache(null).size() + ']'); for (int i = 0; i < gridCnt; i++) { - GridCache<Integer, String> c = grid(i).cache(null); + Cache<Integer, String> c = grid(i).cache(null); assert c.size() < cnt; } @@ -265,7 +265,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { if (evt == LifecycleEventType.AFTER_GRID_START) { - GridCache<Integer, String> c = ignite.cache(null); + Cache<Integer, String> c = ignite.cache(null); if (c.putxIfAbsent(-1, "true")) { populate(ignite.<Integer, String>cache(null), cnt); @@ -301,7 +301,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { * @param cnt Key count. * @throws IgniteCheckedException If failed. */ - private void populate(GridCache<Integer, String> c, int cnt) throws IgniteCheckedException { + private void populate(Cache<Integer, String> c, int cnt) throws IgniteCheckedException { for (int i = 0; i < cnt; i++) c.put(i, value(1024)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java index 01c68e7..580eeef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests that removes are not lost when topology changes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java index 3d0071d..594aa5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java @@ -48,7 +48,7 @@ public class GridCacheDhtTestUtils { * @param cache Cache. * @return Dht cache. */ - static <K, V> GridDhtCacheAdapter<K, V> dht(GridCacheProjection<K, V> cache) { + static <K, V> GridDhtCacheAdapter<K, V> dht(CacheProjection<K, V> cache) { return ((GridNearCacheAdapter<K, V>)cache.<K, V>cache()).dht(); } @@ -59,7 +59,7 @@ public class GridCacheDhtTestUtils { */ @SuppressWarnings({"UnusedAssignment", "unchecked"}) static void prepareKeys(GridDhtCache<Integer, String> dht, int keyCnt) throws IgniteCheckedException { - GridCacheAffinityFunction aff = dht.context().config().getAffinity(); + CacheAffinityFunction aff = dht.context().config().getAffinity(); GridCacheConcurrentMap<Integer, String> cacheMap; @@ -92,9 +92,9 @@ public class GridCacheDhtTestUtils { /** * @param cache Dht cache. */ - static void printAffinityInfo(GridCache<?, ?> cache) { - GridCacheConsistentHashAffinityFunction aff = - (GridCacheConsistentHashAffinityFunction)cache.configuration().getAffinity(); + static void printAffinityInfo(Cache<?, ?> cache) { + CacheConsistentHashAffinityFunction aff = + (CacheConsistentHashAffinityFunction)cache.configuration().getAffinity(); System.out.println("Affinity info."); System.out.println("----------------------------------"); @@ -107,7 +107,7 @@ public class GridCacheDhtTestUtils { * @param idx Cache index */ static void printDhtTopology(GridDhtCache<Integer, String> dht, int idx) { - final GridCacheAffinity<Integer> aff = dht.affinity(); + final CacheAffinity<Integer> aff = dht.affinity(); Ignite ignite = dht.context().grid(); ClusterNode locNode = ignite.cluster().localNode(); @@ -177,7 +177,7 @@ public class GridCacheDhtTestUtils { log.info("Checking balanced state of cache #" + idx); - GridCacheAffinity<Integer> aff = dht.affinity(); + CacheAffinity<Integer> aff = dht.affinity(); Ignite ignite = dht.context().grid(); ClusterNode locNode = ignite.cluster().localNode(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java index 5f3a4bf..62c53d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests cache transaction during preloading. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java index 2c26044..912abab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java @@ -27,11 +27,10 @@ import org.jdk8.backport.*; import org.jetbrains.annotations.*; import org.junit.*; -import javax.cache.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -57,7 +56,7 @@ public class GridCacheGlobalLoadTest extends IgniteCacheAbstractTest { } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 73d9e6f..bd97b6f 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 @@ -74,20 +74,20 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid private void checkUpdateEntry(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); - GridCache<GridCacheAffinityKey<Integer>, Integer> cache = cache(0); + Cache<CacheAffinityKey<Integer>, Integer> cache = cache(0); assert cache.isEmpty(); // Put initial values. for (int i = 0; i < 10; i++) - cache.put(new GridCacheAffinityKey<>(i, affinityKey), i); + cache.put(new CacheAffinityKey<>(i, affinityKey), i); for (int i = 0; i < 3; i++) { try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 10)) { - Set<GridCacheEntry<GridCacheAffinityKey<Integer>, Integer>> set = + Set<CacheEntry<CacheAffinityKey<Integer>, Integer>> set = cache.entrySet(cache(0).affinity().partition(affinityKey)); - for (GridCacheEntry<GridCacheAffinityKey<Integer>, Integer> entry : set) { + for (CacheEntry<CacheAffinityKey<Integer>, Integer> entry : set) { Integer old = entry.get(); if (old != null) @@ -112,7 +112,7 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid final UUID affinityKey = primaryKeyForCache(grid(0)); - final GridCache<UUID, String> cache = grid(0).cache(null); + final Cache<UUID, String> cache = grid(0).cache(null); try (IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affinityKey), PESSIMISTIC, REPEATABLE_READ, 0, 2)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java index 8f50cc3..909e134 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java @@ -58,13 +58,13 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext private void checkNonLocalKey(IgniteTxConcurrency concurrency) throws Exception { final UUID key = primaryKeyForCache(grid(1)); - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); IgniteTx tx = null; try { tx = cache.txStartAffinity(key, concurrency, READ_COMMITTED, 0, 2); - cache.put(new GridCacheAffinityKey<>("1", key), "2"); + cache.put(new CacheAffinityKey<>("1", key), "2"); tx.commit(); @@ -115,13 +115,13 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext private void checkNearReadersUpdate(boolean touchAffKey, IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); - GridCacheAffinityKey<String> key3 = new GridCacheAffinityKey<>("key3", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key3 = new CacheAffinityKey<>("key3", affinityKey); grid(0).cache(null).put(affinityKey, "aff"); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); cache.putAll(F.asMap( key1, "val1", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java index 850cba7..127f591 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledFullApiSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Multi node test for disabled near cache. */ public class GridCachePartitionedNearDisabledFullApiSelfTest extends GridCachePartitionedFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java index ba9f38b..f6f8014 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java @@ -22,10 +22,10 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Metrics test for partitioned cache with disabled near cache. @@ -76,7 +76,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb * @throws Exception If failed. */ public void _testGettingRemovedKey() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(0, 0); @@ -103,7 +103,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb 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(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java index 88d6f05..17119ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Multi node test for disabled near cache. @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest extends GridCachePartitionedMultiNodeFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java index ecf04e0..b3901fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Multi node test for disabled near cache. @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest extends GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java index a45a663..97d8a14 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.cache.*; public class GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest extends GridCachePartitionedTxOriginatingNodeFailureSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.PARTITIONED_ONLY; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java index 0b35fa5..f32be78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedOnlyProjectionSelfTest.java @@ -20,13 +20,13 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests cache with near cache disabled. */ public class GridCachePartitionedOnlyProjectionSelfTest extends GridCachePartitionedProjectionSelfTest { - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java index 051e6fb..66df4d4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -40,7 +40,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE private boolean replicatedAffinity = true; /** */ - private GridCachePreloadMode preloadMode = SYNC; + private CachePreloadMode preloadMode = SYNC; /** {@inheritDoc} */ @Override protected CacheConfiguration cacheConfiguration() { @@ -48,7 +48,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE if (replicatedAffinity) // replicate entries to all nodes - cacheCfg.setAffinity(new GridCacheAffinityFunction() { + cacheCfg.setAffinity(new CacheAffinityFunction() { /** {@inheritDoc} */ @Override public void reset() { } @@ -64,7 +64,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE } /** {@inheritDoc} */ - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext affCtx) { + @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext affCtx) { List<ClusterNode> nodes = new ArrayList<>(affCtx.currentTopologySnapshot()); return Collections.singletonList(nodes); @@ -99,7 +99,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE Collection<Integer> keys = new HashSet<>(); - GridCache<Integer, String> cache = g1.cache(null); + Cache<Integer, String> cache = g1.cache(null); for (int i = 0; i < 100; i++) { keys.add(i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index 12a917b..b456c18 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -38,8 +38,8 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.events.IgniteEventType.*; @@ -74,7 +74,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 18)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18)); cc.setBackups(1); cc.setPreloadMode(SYNC); cc.setDistributionMode(PARTITIONED_ONLY); @@ -248,7 +248,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Integer key : keysMap.values()) { futs.add(multithreadedAsync(new Runnable() { @Override public void run() { - GridCache<Integer, Integer> cache = node.cache(null); + Cache<Integer, Integer> cache = node.cache(null); try { try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { @@ -317,7 +317,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @Override public void run() { - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); int key = (int)Thread.currentThread().getId(); @@ -402,7 +402,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Integer key : keysMap.values()) { futs.add(multithreadedAsync(new Runnable() { @Override public void run() { - GridCache<Integer, Integer> cache = node.cache(null); + Cache<Integer, Integer> cache = node.cache(null); try { try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { @@ -453,7 +453,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @Override public void run() { - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); int key = (int)Thread.currentThread().getId(); @@ -488,7 +488,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra txFut.get(1000); for (int i = 0; i < 3; i++) { - GridCacheConsistentHashAffinityFunction affinity = (GridCacheConsistentHashAffinityFunction)((GridKernal)grid(i)) + CacheConsistentHashAffinityFunction affinity = (CacheConsistentHashAffinityFunction)((GridKernal)grid(i)) .internalCache().context().config().getAffinity(); ConcurrentMap addedNodes = U.field(affinity, "addedNodes"); @@ -555,7 +555,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra private List<Integer> partitions(Ignite node, int partType) { List<Integer> res = new LinkedList<>(); - GridCacheAffinity<Object> aff = node.cache(null).affinity(); + CacheAffinity<Object> aff = node.cache(null).affinity(); for (int partCnt = aff.partitions(), i = 0; i < partCnt; i++) { ClusterNode locNode = node.cluster().localNode();
