http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java index c3dd105..eeb1ff3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java @@ -34,10 +34,10 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.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.*; /** * Checks that readers are properly handled. @@ -139,8 +139,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { Ignite g1 = grid(n1.id()); Ignite g2 = grid(n2.id()); - GridCache<Integer, String> cache1 = g1.cache(null); - GridCache<Integer, String> cache2 = g2.cache(null); + Cache<Integer, String> cache1 = g1.cache(null); + Cache<Integer, String> cache2 = g2.cache(null); // Store some values in cache. assertNull(cache1.put(1, "v1")); @@ -217,8 +217,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { ((GridKernal)g1).internalCache(null).preloader().request(F.asList(1, 2), 2).get(); ((GridKernal)g2).internalCache(null).preloader().request(F.asList(1, 2), 2).get(); - GridCache<Integer, String> cache1 = g1.cache(null); - GridCache<Integer, String> cache2 = g2.cache(null); + Cache<Integer, String> cache1 = g1.cache(null); + Cache<Integer, String> cache2 = g2.cache(null); assertEquals(cache1.affinity().mapKeyToNode(1), g1.cluster().localNode()); assertFalse(cache1.affinity().mapKeyToNode(2).equals(g1.cluster().localNode())); @@ -296,8 +296,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { startGrids(); try { - GridCache<Object, Object> prj0 = grid(0).cache(null); - GridCache<Object, Object> prj1 = grid(1).cache(null); + Cache<Object, Object> prj0 = grid(0).cache(null); + Cache<Object, Object> prj1 = grid(1).cache(null); Map<Integer, Integer> putMap = new HashMap<>(); @@ -332,9 +332,9 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { startGrids(); try { - GridCache<Object, Object> prj0 = grid(0).cache(null); - GridCache<Object, Object> prj1 = grid(1).cache(null); - GridCache<Object, Object> prj2 = grid(2).cache(null); + Cache<Object, Object> prj0 = grid(0).cache(null); + Cache<Object, Object> prj1 = grid(1).cache(null); + Cache<Object, Object> prj2 = grid(2).cache(null); Map<Integer, Integer> putMap = new HashMap<>(); @@ -390,8 +390,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { assertFalse("Nodes cannot be equal: " + primary, primary.equals(backup)); - GridCache<Integer, String> cache1 = grid(primary.id()).cache(null); - GridCache<Integer, String> cache2 = grid(backup.id()).cache(null); + Cache<Integer, String> cache1 = grid(primary.id()).cache(null); + Cache<Integer, String> cache2 = grid(backup.id()).cache(null); // Store a values in cache. assertNull(cache1.put(1, "v1")); @@ -431,7 +431,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { assertEquals(grid(1).localNode(), F.first(aff.nodes(aff.partition(key2), grid(1).nodes()))); - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); assertNull(cache.put(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/near/GridCacheNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java index e7ce57f..8ffaf71 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.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/near/GridCacheNearTxMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java index d58a8a6..28e8620 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java @@ -36,11 +36,11 @@ 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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests near transactions. @@ -130,10 +130,10 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { Ignite g = F.rand(ignites); - g.cache(null).put(new GridCacheAffinityKey<>(i, mainKey), Integer.toString(cntr++)); + g.cache(null).put(new CacheAffinityKey<>(i, mainKey), Integer.toString(cntr++)); } - GridCacheProjection cache = priIgnite.cache(null).flagsOn(GridCacheFlag.CLONE); + CacheProjection cache = priIgnite.cache(null).flagsOn(CacheFlag.CLONE); IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ); @@ -196,7 +196,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void testReadersUpdate(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); try (IgniteTx tx = cache.txStart(concurrency, isolation)) { for (int i = 0; i < 100; i++) @@ -207,7 +207,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { // Create readers. for (int g = 0; g < GRID_CNT; g++) { - GridCache<Integer, Integer> c = grid(g).cache(null); + Cache<Integer, Integer> c = grid(g).cache(null); for (int i = 0; i < 100; i++) assertEquals((Integer)1, c.get(i)); @@ -221,7 +221,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { } for (int g = 0; g < GRID_CNT; g++) { - GridCache<Integer, Integer> c = grid(g).cache(null); + Cache<Integer, Integer> c = grid(g).cache(null); for (int i = 0; i < 100; i++) assertEquals((Integer)2, c.get(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/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java index 36ddd2b..b2ff962 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.PARTITIONED; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * @@ -43,7 +43,7 @@ public class GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest extends } /** {@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/near/GridCacheNearTxPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java index aa4ef00..2b912ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.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/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java index a8067d4..1dae0c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java @@ -32,7 +32,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Partitioned affinity test. @@ -70,7 +70,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends cc.setBackups(2); - GridCacheAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(excNeighbores); + CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(excNeighbores); cc.setAffinity(aff); @@ -90,7 +90,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends * @param ignite Grid. * @return Affinity. */ - static GridCacheAffinity<Object> affinity(Ignite ignite) { + static CacheAffinity<Object> affinity(Ignite ignite) { return ignite.cache(null).affinity(); } @@ -99,7 +99,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends * @param key Key. * @return Nodes. */ - private static Collection<? extends ClusterNode> nodes(GridCacheAffinity<Object> aff, Object key) { + private static Collection<? extends ClusterNode> nodes(CacheAffinity<Object> aff, Object key) { return aff.mapKeyToPrimaryAndBackups(key); } @@ -167,7 +167,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends * @throws Exception If failed. */ private long checkCountPerformance0(Ignite g, int cnt) throws Exception { - GridCacheAffinity<Object> aff = affinity(g); + CacheAffinity<Object> aff = affinity(g); GridTimer timer = new GridTimer("test"); @@ -218,7 +218,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends try { Ignite g = grid(0); - GridCacheAffinity<Object> aff = affinity(g); + CacheAffinity<Object> aff = affinity(g); // Warmup. checkCountPerformance0(g, 10000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java index 85462ef..abb106f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java @@ -41,11 +41,11 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** Hash ID resolver. */ - private GridCacheAffinityNodeHashResolver rslvr; + private CacheAffinityNodeHashResolver rslvr; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheConsistentHashAffinityFunction aff = new CacheConsistentHashAffinityFunction(); aff.setHashIdResolver(rslvr); @@ -77,7 +77,7 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm * @throws Exception If failed. */ public void testDuplicateId() throws Exception { - rslvr = new GridCacheAffinityNodeHashResolver() { + rslvr = new CacheAffinityNodeHashResolver() { @Override public Object resolve(ClusterNode node) { return 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/near/GridCachePartitionedAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index 0cf6992..f88ff90 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -38,12 +38,12 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction.*; +import static org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction.*; import static org.apache.ignite.events.IgniteEventType.*; 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.*; /** * Partitioned affinity test. @@ -68,7 +68,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(BACKUPS); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setPreloadMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); @@ -99,7 +99,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest * @param ignite Grid. * @return Affinity. */ - static GridCacheAffinity<Object> affinity(Ignite ignite) { + static CacheAffinity<Object> affinity(Ignite ignite) { return ignite.cache(null).affinity(); } @@ -108,18 +108,18 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest * @param key Key. * @return Nodes. */ - private static Collection<? extends ClusterNode> nodes(GridCacheAffinity<Object> aff, Object key) { + private static Collection<? extends ClusterNode> nodes(CacheAffinity<Object> aff, Object key) { return aff.mapKeyToPrimaryAndBackups(key); } /** Test predefined affinity - must be ported to all clients. */ @SuppressWarnings("UnaryPlus") public void testPredefined() throws IgniteCheckedException { - GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheConsistentHashAffinityFunction aff = new CacheConsistentHashAffinityFunction(); getTestResources().inject(aff); - aff.setHashIdResolver(new GridCacheAffinityNodeIdHashResolver()); + aff.setHashIdResolver(new CacheAffinityNodeIdHashResolver()); List<ClusterNode> nodes = new ArrayList<>(); @@ -218,11 +218,11 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest @SuppressWarnings("UnaryPlus") public void testPredefinedHashIdResolver() throws IgniteCheckedException { // Use Md5 hasher for this test. - GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheConsistentHashAffinityFunction aff = new CacheConsistentHashAffinityFunction(); getTestResources().inject(aff); - aff.setHashIdResolver(new GridCacheAffinityNodeHashResolver() { + aff.setHashIdResolver(new CacheAffinityNodeHashResolver() { @Override public Object resolve(ClusterNode node) { return node.attribute(DFLT_REPLICA_COUNT_ATTR_NAME); } @@ -364,7 +364,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest X.println(">>>"); X.println(">>> Printing affinity for node: " + g.name()); - GridCacheAffinity<Object> aff = affinity(g); + CacheAffinity<Object> aff = affinity(g); for (int i = 0; i < keyCnt; i++) { Collection<? extends ClusterNode> affNodes = nodes(aff, i); @@ -394,7 +394,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest Ignite mg = grid(0); - GridCache<Integer, String> mc = mg.cache(null); + Cache<Integer, String> mc = mg.cache(null); int keyCnt = 10; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java index 96f7bf4..31621ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.*; 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.CacheDistributionMode.*; /** * Test cases for multi-threaded tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java index c13d02e..b86419b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java @@ -35,9 +35,9 @@ public class GridCachePartitionedBasicOpSelfTest extends GridCacheBasicOpAbstrac CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setBackups(2); - cc.setPreloadMode(GridCachePreloadMode.SYNC); + cc.setPreloadMode(CachePreloadMode.SYNC); cc.setAtomicityMode(TRANSACTIONAL); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java index 400887b..17b45cd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java @@ -33,10 +33,10 @@ 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.CacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -116,7 +116,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA /** * @return Distribution mode. */ - protected GridCacheDistributionMode mode() { + protected CacheDistributionMode mode() { return NEAR_PARTITIONED; } @@ -124,7 +124,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPutFromPrimary() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); int key = 0; @@ -152,7 +152,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPutFromBackup() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); int key = 0; @@ -180,7 +180,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPutFromNear() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); int key = 0; @@ -208,7 +208,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPutIfAbsentFromPrimary() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); int key = 0; @@ -236,7 +236,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPutIfAbsentFromBackup() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); int key = 0; @@ -264,7 +264,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPutIfAbsentFromNear() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); int key = 0; @@ -292,7 +292,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testPutAll() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); Map<Integer, String> map = new HashMap<>(10); @@ -308,7 +308,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA * @throws Exception If failed. */ public void testMultipleOperations() throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { cache.put(1, "val"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java index 62cb19e..8656154 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java @@ -30,8 +30,8 @@ import java.util.*; */ public class GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest extends GridCachePartitionedFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.CLIENT_ONLY; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.CLIENT_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/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 41d4575..b8cab48 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 @@ -48,7 +48,7 @@ public class GridCachePartitionedEntryLockSelfTest extends GridCacheAbstractSelf cache().put("key", 1); for (int i = 0; i < gridCount(); i++) { - final GridCacheEntry<String, Integer> e = cache(i).entry("key"); + final CacheEntry<String, Integer> e = cache(i).entry("key"); if (e.backup()) { assert !e.isLocked(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java index b069a75..654a2f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.internal.processors.cache.distributed.*; 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 events. @@ -35,7 +35,7 @@ public class GridCachePartitionedEventSelfTest extends GridCacheEventAbstractTes cfg.setCacheMode(PARTITIONED); cfg.setBackups(gridCount() - 1); - cfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cfg.setAtomicityMode(TRANSACTIONAL); cfg.setDistributionMode(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/near/GridCachePartitionedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java index 4af4a4d..eb5e2f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java @@ -37,7 +37,7 @@ import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for partitioned cache automatic eviction. @@ -79,8 +79,8 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT cc.setCacheMode(PARTITIONED); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setEvictionPolicy(new GridCacheFifoEvictionPolicy(EVICT_CACHE_SIZE)); - cc.setNearEvictionPolicy(new GridCacheFifoEvictionPolicy(EVICT_CACHE_SIZE)); + cc.setEvictionPolicy(new CacheFifoEvictionPolicy(EVICT_CACHE_SIZE)); + cc.setNearEvictionPolicy(new CacheFifoEvictionPolicy(EVICT_CACHE_SIZE)); cc.setSwapEnabled(false); // We set 1 backup explicitly. @@ -169,7 +169,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT GridDhtCacheAdapter<String, Integer> dht0 = dht(cache(0)); GridDhtCacheAdapter<String, Integer> dht1 = dht(cache(1)); - GridCacheAffinity<String> aff = dht0.affinity(); + CacheAffinity<String> aff = dht0.affinity(); TouchedExpiryPolicy plc = new TouchedExpiryPolicy(new Duration(MILLISECONDS, 10)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 b6f9a94..1a00698 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 @@ -33,7 +33,7 @@ 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.CacheDistributionMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -61,7 +61,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setBackups(GRID_CNT - 1); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); @@ -96,7 +96,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom info("Primary node for key [id=" + node.id() + ", order=" + node.order() + ", key=" + key + ']'); - GridCache<Integer, String> cache = cache(idx); + Cache<Integer, String> cache = cache(idx); cache.put(key, "val"); @@ -105,11 +105,11 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom for (int checkIdx = 1; checkIdx < GRID_CNT; checkIdx++) { info("Check grid index: " + checkIdx); - GridCache<Integer, String> checkCache = cache(checkIdx); + Cache<Integer, String> checkCache = cache(checkIdx); assert !checkCache.lock(key, -1); - GridCacheEntry e = checkCache.entry(key); + CacheEntry e = checkCache.entry(key); assert e.isLocked() : "Entry is not locked for grid [idx=" + checkIdx + ", entry=" + e + ']'; } @@ -137,9 +137,9 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom for (int checkIdx = 1; checkIdx < GRID_CNT; checkIdx++) { info("Check grid index: " + checkIdx); - GridCache<Integer, String> checkCache = cache(checkIdx); + Cache<Integer, String> checkCache = cache(checkIdx); - GridCacheEntry e = checkCache.entry(key); + CacheEntry e = checkCache.entry(key); info("Checking entry: " + e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java index 7121d19..5404d99 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java @@ -29,7 +29,7 @@ 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.CacheDistributionMode.*; /** * Test filtered put. @@ -89,7 +89,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT public void testFilteredPutCheckNear() throws Exception { doFilteredPut(); - GridCache<Integer, Integer> c = cache(); + Cache<Integer, Integer> c = cache(); assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size(); } @@ -100,7 +100,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT public void testFilteredPutCheckDht() throws Exception { doFilteredPut(); - GridCache<Integer, Integer> c = + Cache<Integer, Integer> c = ((GridNearCacheAdapter<Integer, Integer>)cache().<Integer, Integer>cache()).dht(); assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size(); @@ -112,7 +112,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT public void testPutAndRollbackCheckNear() throws Exception { doPutAndRollback(); - GridCache<Integer, Integer> c = cache(); + Cache<Integer, Integer> c = cache(); assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size(); } @@ -123,7 +123,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT public void testPutAndRollbackCheckDht() throws Exception { doPutAndRollback(); - GridCache<Integer, Integer> c = + Cache<Integer, Integer> c = ((GridNearCacheAdapter<Integer, Integer>)cache().<Integer, Integer>cache()).dht(); assert c.entrySet().isEmpty() : "Actual size: " + c.entrySet().size(); @@ -133,7 +133,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ private void doFilteredPut() throws Exception { - GridCache<Integer, Integer> c = cache(); + Cache<Integer, Integer> c = cache(); try (IgniteTx tx = c.txStart()) { assert !c.putx(1, 1, F.<Integer, Integer>cacheHasPeekValue()); @@ -150,7 +150,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ private void doPutAndRollback() throws Exception { - GridCache<Integer, Integer> c = cache(); + Cache<Integer, Integer> c = cache(); try (IgniteTx tx = c.txStart()) { assert c.putx(1, 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/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 0439d15..9255fea 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 @@ -72,7 +72,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp cache.put(key, i); } - GridCacheConsistentHashAffinityFunction aff = (GridCacheConsistentHashAffinityFunction)cache.configuration().getAffinity(); + CacheConsistentHashAffinityFunction aff = (CacheConsistentHashAffinityFunction)cache.configuration().getAffinity(); for (int i = 0 ; i < aff.getPartitions(); i++) String.valueOf(cache.entrySet(i)); @@ -114,17 +114,17 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp Ignite g = grid(i); // This node has the partition. - GridCache<String, Integer> nodeCache = g.cache(null); + Cache<String, Integer> nodeCache = g.cache(null); if (offheapTiered(nodeCache)) continue; - Set<GridCacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); + Set<CacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) { Collection<String> cp = new LinkedList<>(vals); - for (GridCacheEntry<String, Integer> e : partEntrySet) { + for (CacheEntry<String, Integer> e : partEntrySet) { String eKey = e.getKey(); assertTrue("Got unexpected key:" + eKey, cp.contains(eKey)); @@ -156,20 +156,20 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp Ignite g = grid(i); // This node has the partition. - GridCache<String, Integer> nodeCache = g.cache(null); + Cache<String, Integer> nodeCache = g.cache(null); if (offheapTiered(nodeCache)) continue; // First node with this partition will remove first key from partition. if (nodeCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key)) { - Set<GridCacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); + Set<CacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); - Iterator<GridCacheEntry<String, Integer>> it = partEntrySet.iterator(); + Iterator<CacheEntry<String, Integer>> it = partEntrySet.iterator(); assertTrue(it.hasNext()); - GridCacheEntry<String, Integer> next = it.next(); + CacheEntry<String, Integer> next = it.next(); deleted.add(next.getKey()); @@ -190,7 +190,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp * @throws Exception If failed. */ public void testPartitionEntrySetRemove() throws Exception { - GridCache<String, Integer> cache = cache(0); + Cache<String, Integer> cache = cache(0); Map<Integer, Collection<String>> partMap = new HashMap<>(); @@ -224,12 +224,12 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp Ignite g = grid(i); // This node has the partition. - GridCache<String, Integer> nodeCache = g.cache(null); + Cache<String, Integer> nodeCache = g.cache(null); if (offheapTiered(nodeCache)) continue; - Set<GridCacheEntry<String, Integer>> partEntrySet = nodeCache.entrySet(part); + Set<CacheEntry<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/cafee25f/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 193d362..3885b91 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 @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -30,11 +31,10 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Load cache test. @@ -86,9 +86,9 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes cache.localLoadCache(null, PUT_CNT); - GridCache<Integer, String> cache0 = cache(0); + Cache<Integer, String> cache0 = cache(0); - GridCacheAffinity aff = cache0.affinity(); + CacheAffinity aff = cache0.affinity(); int[] parts = aff.allPartitions(grid(0).localNode()); @@ -103,7 +103,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes int cnt2 = 0; - for (GridCacheEntry<Integer, String> e : cache0.entrySet()) { + for (CacheEntry<Integer, String> e : cache0.entrySet()) { assert e.primary() || e.backup(); cnt2++; @@ -143,7 +143,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends Integer, ? extends String> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Integer, ? extends String> e) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java index 3f1417d..f1edfff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; 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.*; /** * Partitioned cache metrics test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 6d54934..f134344 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -41,8 +41,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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -103,7 +103,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(NEAR_PARTITIONED); cacheCfg.setAtomicityMode(TRANSACTIONAL); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setBackups(backups); cfg.setCacheConfiguration(cacheCfg); @@ -120,7 +120,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst * @param cache Cache. * @return Affinity. */ - private static GridCacheAffinity<String> affinity(GridCache<String, Integer> cache) { + private static CacheAffinity<String> affinity(Cache<String, Integer> cache) { return cache.affinity(); } @@ -241,7 +241,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst X.println("*** Retries: " + RETRIES); X.println("*** Log frequency: " + LOG_FREQ); - GridCacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null)); + CacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null)); Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY); @@ -306,7 +306,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) info("***"); - GridCache<String, Integer> c = pri.cache(null); + Cache<String, Integer> c = pri.cache(null); Integer oldCntr = c.peek(CNTR_KEY); @@ -403,7 +403,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) info("***"); - GridCache<String, Integer> c = near.cache(null); + Cache<String, Integer> c = near.cache(null); Integer oldCntr = c.peek(CNTR_KEY); @@ -488,7 +488,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst dht(g).context().tm().printMemoryStats(); near(g).context().tm().printMemoryStats(); - GridCache<String, Integer> cache = grid(i).cache(null); + Cache<String, Integer> cache = grid(i).cache(null); int cntr = nearThreads > 0 && nears.contains(g) ? cache.get(CNTR_KEY) : cache.peek(CNTR_KEY); @@ -543,7 +543,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst * @throws Exception If failed. */ private void checkNearAndPrimaryMultiNode(int gridCnt) throws Exception { - GridCacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null)); + CacheAffinity<String> aff = affinity(grid(0).<String, Integer>cache(null)); Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(CNTR_KEY); @@ -576,7 +576,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst for (int i = 0; i < gridCnt; i++) { Ignite g = grid(i); - GridCache<String, Integer> cache = grid(i).cache(null); + Cache<String, Integer> cache = grid(i).cache(null); int cntr = cache.peek(CNTR_KEY); @@ -640,7 +640,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) log.info("***"); - GridCache<String, Integer> c = near.cache(null); + Cache<String, Integer> c = near.cache(null); Integer oldCntr = c.peek(CNTR_KEY); @@ -709,7 +709,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst if (DEBUG) log.info("***"); - GridCache<String, Integer> c = pri.cache(null); + Cache<String, Integer> c = pri.cache(null); Integer oldCntr = c.peek(CNTR_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/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 bb1c773..e69d160 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 @@ -33,7 +33,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.GridCachePeekMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Multi-node tests for partitioned cache. @@ -74,8 +74,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < size; i++) putMap.put(i, i * i); - GridCache<Object, Object> prj0 = grid(0).cache(null); - GridCache<Object, Object> prj1 = grid(1).cache(null); + Cache<Object, Object> prj0 = grid(0).cache(null); + Cache<Object, Object> prj1 = grid(1).cache(null); prj0.putAll(putMap); @@ -101,8 +101,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < size; i++) putMap.put(i, i); - GridCache<Object, Object> prj0 = grid(0).cache(null); - GridCache<Object, Object> prj1 = grid(1).cache(null); + Cache<Object, Object> prj0 = grid(0).cache(null); + Cache<Object, Object> prj1 = grid(1).cache(null); prj0.putAll(putMap); @@ -135,7 +135,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti int size = 10; - GridCache<Object, Object> prj0 = grid(0).cache(null); + Cache<Object, Object> prj0 = grid(0).cache(null); for (int i = 0; i < size; i++) { info("Putting value [i=" + i + ']'); @@ -148,7 +148,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < gridCount(); i++) { assertEquals(0, context(i).tm().idMapSize()); - GridCache<Object, Object> cache = grid(i).cache(null); + Cache<Object, Object> cache = grid(i).cache(null); ClusterNode node = grid(i).localNode(); for (int k = 0; k < size; k++) { @@ -200,7 +200,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti cache().put("key", 1); for (int i = 0; i < gridCount(); i++) { - GridCacheEntry<String, Integer> e = cache(i).entry("key"); + CacheEntry<String, Integer> e = cache(i).entry("key"); if (e.backup()) { assert cache(i).evict("key") : "Entry was not evicted [idx=" + i + ", entry=" + @@ -230,9 +230,9 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti Integer nearPeekVal = nearEnabled ? 1 : null; - GridCache<String, Integer> c = cache(i); + Cache<String, Integer> c = cache(i); - GridCacheEntry<String, Integer> e = c.entry("key"); + CacheEntry<String, Integer> e = c.entry("key"); if (e.backup()) { assertNull("NEAR_ONLY for cache: " + i, e.peek(F.asList(NEAR_ONLY))); @@ -267,9 +267,9 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti Integer nearPeekVal = nearEnabled ? 1 : null; - GridCache<String, Integer> c = cache(i); + Cache<String, Integer> c = cache(i); - GridCacheEntry<String, Integer> e = c.entry("key"); + CacheEntry<String, Integer> e = c.entry("key"); if (e.backup()) { assert e.peek(F.asList(NEAR_ONLY)) == null; @@ -366,7 +366,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("Node: " + node); - GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); + Cache<String, Integer> cache = G.ignite(node.id()).cache(null); checkLockAsyncWithTimeoutEntry("key", cache); } @@ -384,7 +384,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("Node: " + node); - GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); + Cache<String, Integer> cache = G.ignite(node.id()).cache(null); checkLockAsyncWithTimeoutEntry("key", cache); } @@ -412,7 +412,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("Node: " + node); - GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); + Cache<String, Integer> cache = G.ignite(node.id()).cache(null); checkLockAsyncWithTimeoutEntry("key", cache); } @@ -422,11 +422,11 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti * @param cache Cache. * @throws Exception If failed. */ - private void checkLockAsyncWithTimeoutEntry(String key, GridCacheProjection<String,Integer> cache) + private void checkLockAsyncWithTimeoutEntry(String key, CacheProjection<String,Integer> cache) throws Exception { assert lockingEnabled(); - final GridCacheEntry<String, Integer> e = cache.entry(key); + final CacheEntry<String, Integer> e = cache.entry(key); info("Entry [e=" + e + ", primary=" + e.primary() + ", backup=" + e.backup() + ']'); @@ -528,7 +528,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti Object key = new Object() { /** */ @SuppressWarnings("UnusedDeclaration") - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private final Object key0 = affKey; @Override public boolean equals(Object obj) { @@ -542,11 +542,11 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti info("All affinity nodes: " + affinityNodes()); - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); info("Cache affinity nodes: " + cache.affinity().mapKeyToPrimaryAndBackups(key)); - GridCacheAffinity<Object> aff = cache.affinity(); + CacheAffinity<Object> aff = cache.affinity(); Collection<ClusterNode> nodes = aff.mapKeyToPrimaryAndBackups(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/near/GridCachePartitionedMultiNodeLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java index 753f18d..c1de822 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.distributed.*; 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.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java index 758c6e8..4932062 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.distributed.*; 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.CacheDistributionMode.*; /** * Test cases for multi-threaded tests. @@ -37,7 +37,7 @@ public class GridCachePartitionedMultiNodeSelfTest extends GridCacheMultiNodeAbs cc.setCacheMode(PARTITIONED); cc.setBackups(2); // 1 + backups == gridCnt. - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(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/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index a93d8a1..9e1499e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -32,7 +32,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -66,8 +66,8 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA cc.setCacheMode(PARTITIONED); cc.setBackups(1); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - cc.setEvictionPolicy(new GridCacheFifoEvictionPolicy<>(1000)); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); + cc.setEvictionPolicy(new CacheFifoEvictionPolicy<>(1000)); cc.setNearEvictionPolicy(new GridCacheAlwaysEvictionPolicy()); cc.setSwapEnabled(false); cc.setAtomicityMode(TRANSACTIONAL); @@ -175,7 +175,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA multithreaded(new CAX() { @SuppressWarnings({"BusyWait"}) @Override public void applyx() throws IgniteCheckedException { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { int kv = cntr.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java index e5acdae..57cbda8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * @@ -27,7 +27,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest extends GridCachePartitionedBasicStoreMultiNodeSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode mode() { + @Override protected CacheDistributionMode mode() { 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/near/GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.java index ed92a2d..dd51462 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.cache.*; public class GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest extends GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.NEAR_ONLY; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.NEAR_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/near/GridCachePartitionedNestedTxTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java index b671136..a15e7f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Partitioned cache nested transaction test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java index 3a90e77..8f82284 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.distributed.*; 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.CacheDistributionMode.*; /** * Tests for node failure in transactions. @@ -38,7 +38,7 @@ public class GridCachePartitionedNodeFailureSelfTest extends GridCacheNodeFailur CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); cc.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/near/GridCachePartitionedNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java index c4f20f8..928e656 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java @@ -23,9 +23,9 @@ import org.apache.ignite.configuration.*; 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.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test node restart. @@ -46,7 +46,7 @@ public class GridCachePartitionedNodeRestartTest extends GridCacheAbstractNodeRe cc.setStartSize(20); cc.setPreloadMode(preloadMode); cc.setPreloadBatchSize(preloadBatchSize); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cc.setBackups(backups); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java index de590bd..e2fde7a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.transactions.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test node restart. @@ -45,7 +45,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb cc.setStartSize(20); cc.setPreloadMode(preloadMode); cc.setPreloadBatchSize(preloadBatchSize); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cc.setBackups(backups); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index 2c96f4c..bb3289e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -31,8 +31,8 @@ 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for replicated cache preloader. @@ -84,8 +84,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { switch (evt) { case AFTER_GRID_START: { - GridCache<Object, MyValue> c1 = ignite.cache("one"); - GridCache<Object, MyValue> c2 = ignite.cache("two"); + Cache<Object, MyValue> c1 = ignite.cache("one"); + Cache<Object, MyValue> c2 = ignite.cache("two"); if (!ignite.name().contains("Test0")) { info("Keys already in cache:"); @@ -145,8 +145,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - GridCache<Object, MyValue> c1 = grid(j).cache("one"); - GridCache<Object, MyValue> c2 = grid(j).cache("two"); + Cache<Object, MyValue> c1 = grid(j).cache("one"); + Cache<Object, MyValue> c2 = grid(j).cache("two"); int k = 0; @@ -175,9 +175,9 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo info("Checking '" + (i + 1) + "' nodes..."); for (int j = 0; j < G.allGrids().size(); j++) { - GridCache<Object, MyValue> c2 = grid(j).cache("two"); + Cache<Object, MyValue> c2 = grid(j).cache("two"); - GridCacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(null); + CacheQuery<Map.Entry<Object, MyValue>> qry = c2.queries().createScanQuery(null); int totalCnt = F.sumInt(qry.execute(new IgniteReducer<Map.Entry<Object, MyValue>, Integer>() { @IgniteInstanceResource http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java index b20b345..3f4feb1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -134,7 +134,7 @@ public class GridCachePartitionedProjectionSelfTest extends GridCacheAbstractPro assertFalse(cache().containsKey("key")); assertNull(cache().get("key")); - GridCacheProjection<String, Integer> prj = cache().flagsOn(SKIP_SWAP, SKIP_STORE); + CacheProjection<String, Integer> prj = cache().flagsOn(SKIP_SWAP, SKIP_STORE); prj.put("key", 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java index 5fb41dc..14beacb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java @@ -36,7 +36,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -72,9 +72,9 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb cc.setCacheMode(PARTITIONED); // Query should be executed without ongoing transactions. - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setBackups(0); - cc.setPreloadMode(GridCachePreloadMode.SYNC); + cc.setPreloadMode(CachePreloadMode.SYNC); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); @@ -101,7 +101,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb // Clean up all caches. for (int i = 0; i < GRID_CNT; i++) - grid(i).cache(null).removeAll(F.<GridCacheEntry<Object, Object>>alwaysTrue()); + grid(i).cache(null).removeAll(F.<CacheEntry<Object, Object>>alwaysTrue()); } /** {@inheritDoc} */ @@ -128,7 +128,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb final Person p3 = new Person("Mike", 1800, "Bachelor"); final Person p4 = new Person("Bob", 1900, "Bachelor"); - final GridCache<UUID, Person> cache0 = grid(0).cache(null); + final Cache<UUID, Person> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -147,7 +147,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb IgniteFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { - GridCacheQuery<Map.Entry<UUID, Person>> masters = cache0.queries().createFullTextQuery( + CacheQuery<Map.Entry<UUID, Person>> masters = cache0.queries().createFullTextQuery( Person.class, "Master"); Collection<Map.Entry<UUID, Person>> entries = masters.execute().get(); @@ -168,7 +168,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb IgniteFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { - GridCacheQuery<Map.Entry<UUID, Person>> bachelors = + CacheQuery<Map.Entry<UUID, Person>> bachelors = cache0.queries().createSqlQuery(Person.class, "degree = 'Bachelor'"); Collection<Map.Entry<UUID, Person>> entries = bachelors.execute().get(); @@ -210,16 +210,16 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb private UUID id = UUID.randomUUID(); /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private String name; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private int salary; /** */ - @GridCacheQuerySqlField - @GridCacheQueryTextField + @CacheQuerySqlField + @CacheQueryTextField private String degree; /** Required by {@link Externalizable}. */
