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/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java index b097f25..5ab4365 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java @@ -35,8 +35,8 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends private static final int BACKUP_CNT = 2; /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.NEAR_PARTITIONED; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.NEAR_PARTITIONED; } /** {@inheritDoc} */
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/GridCachePartitionedUnloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java index ea586ca..28e5c4b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java @@ -33,7 +33,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.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -62,7 +62,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setPreloadMode(SYNC); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10)); + cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10)); cacheCfg.setBackups(0); return cacheCfg; } @@ -75,7 +75,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract Collection<Integer> allKeys = new ArrayList<>(100); - GridCache<Integer, String> cache = g1.cache(null); + Cache<Integer, String> cache = g1.cache(null); for (int i = 0; i < 100; i++) { cache.put(i, "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/dht/IgniteTxConsistencyColocatedRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.java index 8b9dfe0..dea3855 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxConsistencyColocatedRestartSelfTest.java @@ -30,7 +30,7 @@ public class IgniteTxConsistencyColocatedRestartSelfTest extends IgniteTxConsist } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode partitionDistributionMode() { - return GridCacheDistributionMode.PARTITIONED_ONLY; + @Override protected CacheDistributionMode partitionDistributionMode() { + 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/IgniteTxReentryColocatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java index 61f8f63..283df90 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java @@ -43,7 +43,7 @@ public class IgniteTxReentryColocatedSelfTest extends IgniteTxReentryAbstractSel @Override protected int testKey() { int key = 0; - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); while (true) { Collection<ClusterNode> nodes = cache.affinity().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/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index c601f96..0dea907 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -41,8 +41,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; 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 GridDhtInvalidPartitionException handling in ATOMIC cache during restarts. @@ -59,7 +59,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA private CacheAtomicWriteOrderMode writeOrder; /** Write sync. */ - private GridCacheWriteSynchronizationMode writeSync; + private CacheWriteSynchronizationMode writeSync; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -148,7 +148,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA * @param writeSync Write synchronization mode to check. * @throws Exception If failed. */ - private void checkRestarts(CacheAtomicWriteOrderMode writeOrder, GridCacheWriteSynchronizationMode writeSync) + private void checkRestarts(CacheAtomicWriteOrderMode writeOrder, CacheWriteSynchronizationMode writeSync) throws Exception { this.writeOrder = writeOrder; this.writeSync = writeSync; @@ -158,7 +158,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA startGrids(gridCnt); try { - final GridCache<Object, Object> cache = grid(0).cache(null); + final Cache<Object, Object> cache = grid(0).cache(null); final int range = 100_000; 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/atomic/GridCacheAtomicPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java index 7f605cc..26701c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java @@ -29,10 +29,10 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; -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.*; /** * Simple test for preloading in ATOMIC cache. @@ -97,7 +97,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { awaitPartitionMapExchange(); - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); List<Integer> keys = generateKeys(grid(0).localNode(), cache); @@ -166,7 +166,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { ClusterNode node = grid.localNode(); - GridCache<Object, Object> cache = grid.cache(null); + Cache<Object, Object> cache = grid.cache(null); boolean primary = cache.affinity().isPrimary(node, key); boolean backup = cache.affinity().isBackup(node, key); @@ -184,10 +184,10 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { * @param cache Cache to get affinity for. * @return Collection of keys. */ - private List<Integer> generateKeys(ClusterNode node, GridCache<Object, Object> cache) { + private List<Integer> generateKeys(ClusterNode node, Cache<Object, Object> cache) { List<Integer> keys = new ArrayList<>(3); - GridCacheAffinity<Object> aff = cache.affinity(); + CacheAffinity<Object> aff = cache.affinity(); int base = 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/atomic/GridCacheValueConsistencyAtomicNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicNearEnabledSelfTest.java index 8cba520..16bfe65 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicNearEnabledSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests cache value consistency for ATOMIC mode with near cache enabled. */ public class GridCacheValueConsistencyAtomicNearEnabledSelfTest extends GridCacheValueConsistencyAtomicSelfTest { /** {@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/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java index a02f9c6..56c449d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests cache value consistency for ATOMIC mode with near cache enabled. @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest extends GridCacheValueConsistencyAtomicSelfTest { /** {@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/atomic/GridCacheValueConsistencyAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java index 689909d..9cb84b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java @@ -29,7 +29,7 @@ import java.io.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; /** * Tests cache value consistency for ATOMIC mode. @@ -92,7 +92,7 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi int total = 0; for (int idx = 0; idx < gridCount(); idx++) { - GridCache<Integer, Integer> cache = grid(idx).cache(null); + Cache<Integer, Integer> cache = grid(idx).cache(null); for (int i = 0; i < keyCnt; i++) { Integer val = cache.peek(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/GridCacheAbstractNearPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAbstractNearPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAbstractNearPartitionedByteArrayValuesSelfTest.java index 56dc84a..b8c999f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAbstractNearPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAbstractNearPartitionedByteArrayValuesSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests for byte array values in NEAR-PARTITIONED caches. @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public abstract class GridCacheAbstractNearPartitionedByteArrayValuesSelfTest extends GridCacheAbstractPartitionedByteArrayValuesSelfTest { /** {@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/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java index a04958e..fabce7f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java @@ -34,7 +34,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. @@ -89,13 +89,13 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest /** * @return Affinity function for test. */ - protected abstract GridCacheAffinityFunction affinityFunction(); + protected abstract CacheAffinityFunction affinityFunction(); /** * @param ignite Grid. * @return Affinity. */ - static GridCacheAffinity<Object> affinity(Ignite ignite) { + static CacheAffinity<Object> affinity(Ignite ignite) { return ignite.cache(null).affinity(); } @@ -104,7 +104,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest * @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); } @@ -124,7 +124,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest for (int i = 0; i < grids; i++) { final Ignite g = grid(i); - GridCacheAffinity<Object> aff = affinity(g); + CacheAffinity<Object> aff = affinity(g); List<TcpDiscoveryNode> top = new ArrayList<>(); 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/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 6ccdd02..ef954a6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; 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.events.IgniteEventType.*; /** @@ -64,13 +64,13 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } /** {@inheritDoc} */ @Override public void testSize() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); int size = 10; @@ -101,8 +101,8 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache /** {@inheritDoc} */ @Override public void testClear() throws Exception { - GridCache<String, Integer> nearCache = cache(); - GridCache<String, Integer> primary = fullCache(); + Cache<String, Integer> nearCache = cache(); + Cache<String, Integer> primary = fullCache(); Collection<String> keys = primaryKeysForCache(primary, 3); @@ -174,8 +174,8 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache /** {@inheritDoc} */ @Override public void testClearKeys() throws Exception { - GridCache<String, Integer> nearCache = cache(); - GridCache<String, Integer> primary = fullCache(); + Cache<String, Integer> nearCache = cache(); + Cache<String, Integer> primary = fullCache(); Collection<String> keys = primaryKeysForCache(primary, 3); @@ -224,7 +224,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache /** {@inheritDoc} */ @Override public void testEvictExpired() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); String key = primaryKeysForCache(cache, 1).get(0); @@ -331,7 +331,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache /** {@inheritDoc} */ @Override public void testPeekExpired() throws Exception { - GridCache<String, Integer> c = cache(); + Cache<String, Integer> c = cache(); String key = primaryKeysForCache(c, 1).get(0); @@ -355,7 +355,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache /** {@inheritDoc} */ @Override public void testEvict() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); List<String> keys = primaryKeysForCache(cache, 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/near/GridCacheAtomicMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java index 0ab7e2c..12317f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -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.*; /** * Multi-node tests for partitioned cache. @@ -41,7 +41,7 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione } /** {@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/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java index e8f3783..954066a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Multi-node tests for partitioned cache. @@ -41,7 +41,7 @@ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest } /** {@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/near/GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.java index dfadece..d1c77d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.java @@ -19,14 +19,14 @@ 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.*; /** * Multi-node tests for atomic cache with clock write order mode and near cache enabled. */ public class GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest { /** {@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/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java index 9c5d6b4..b3e981e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.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.*; /** * Multi-node tests for atomic cache with primary write order mode and near cache enabled. @@ -27,7 +27,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest{ /** {@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/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java index d12954b..af113fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java @@ -25,7 +25,7 @@ import java.util.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests NEAR_ONLY cache. @@ -62,7 +62,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -75,8 +75,8 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe /** {@inheritDoc} */ @Override public void testClear() throws Exception { - GridCache<String, Integer> nearCache = cache(); - GridCache<String, Integer> primary = fullCache(); + Cache<String, Integer> nearCache = cache(); + Cache<String, Integer> primary = fullCache(); Collection<String> keys = primaryKeysForCache(primary, 3); @@ -152,7 +152,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe /** {@inheritDoc} */ @Override public void testEvictExpired() throws Exception { - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); String key = primaryKeysForCache(cache, 1).get(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/near/GridCacheAtomicNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java index 48f1179..c6b0574 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -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/GridCacheAtomicOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java index 68afe21..12bcb84 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests partitioned cache with values being stored off-heap. @@ -40,7 +40,7 @@ public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedO } /** {@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/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java index 21caba2..de87960 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests partitioned cache with values being stored off-heap. @@ -41,7 +41,7 @@ public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends } /** {@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/near/GridCacheAtomicPartitionedMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java index 4a9f152..2db0b92 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.internal.processors.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; 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 atomic 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/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java index 2e9ca77..abe114c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -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/GridCacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest.java index c452fda..af33567 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.cache.affinity.consistenthash.*; public class GridCacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest extends GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAffinityFunction affinityFunction() { - return new GridCacheConsistentHashAffinityFunction(true); + @Override protected CacheAffinityFunction affinityFunction() { + return new CacheConsistentHashAffinityFunction(true); } } 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/GridCacheExNearFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheExNearFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheExNearFullApiSelfTest.java index b341b62..dbc6223 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheExNearFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheExNearFullApiSelfTest.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 private cache interface on partitioned cache with near enabled. @@ -33,7 +33,7 @@ public class GridCacheExNearFullApiSelfTest extends GridCacheExAbstractFullApiSe } /** {@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/GridCacheGetStoreErrorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java index 06e09b4..efef8f39 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java @@ -27,13 +27,12 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; 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.*; /** @@ -140,7 +139,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest { for (int i = 0; i < 1000; i++) { key = String.valueOf(i); - GridCacheEntry<Object, Object> entry = grid(0).cache(null).entry(key); + CacheEntry<Object, Object> entry = grid(0).cache(null).entry(key); if (!entry.primary() && entry.backup()) break; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java index 3112711..a90f5c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java @@ -33,10 +33,10 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; 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.*; /** * Tests entries distribution between primary-backup-near caches according to nodes count in grid. @@ -90,7 +90,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { startGridsMultiThreaded(gridCnt); try { - GridCache<Integer, String> c = grid(0).cache(null); + Cache<Integer, String> c = grid(0).cache(null); int cnt = 100; @@ -120,7 +120,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { private Ignite ignite; @Override public Object call() throws Exception { - GridCache<Integer, String> c = ignite.cache(null); + Cache<Integer, String> c = ignite.cache(null); for (int i = 0; i < cnt; i++) c.putx(i, Integer.toString(i)); @@ -154,7 +154,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { private Ignite ignite; @Override public Object call() throws Exception { - GridCache<Integer, String> c = ignite.cache(null); + Cache<Integer, String> c = ignite.cache(null); for (int i = 0; i < cnt; i++) c.putx(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/near/GridCacheNearExpiredEntriesPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearExpiredEntriesPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearExpiredEntriesPreloadSelfTest.java index 775055d..0996140 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearExpiredEntriesPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearExpiredEntriesPreloadSelfTest.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 GridCacheNearExpiredEntriesPreloadSelfTest extends GridCacheExpired } /** {@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/GridCacheNearJobExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java index 8c60dc4..47a8f29 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java @@ -22,7 +22,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.*; /** * Tests cache access from within jobs. @@ -37,7 +37,7 @@ public class GridCacheNearJobExecutionSelfTest extends GridCacheAbstractJobExecu CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(CacheMode.PARTITIONED); - 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/GridCacheNearMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java index a960b2b..214bb84 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.internal.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Cache metrics test. @@ -32,7 +32,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { private static final int KEY_CNT = 50; /** {@inheritDoc} */ - @Override protected GridCacheWriteSynchronizationMode writeSynchronization() { + @Override protected CacheWriteSynchronizationMode writeSynchronization() { return FULL_SYNC; } @@ -89,7 +89,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testPrimaryPut() throws Exception { Ignite g0 = grid(0); - GridCache<Integer, Integer> cache0 = g0.cache(null); + Cache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -142,7 +142,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testBackupPut() throws Exception { Ignite g0 = grid(0); - GridCache<Integer, Integer> cache0 = g0.cache(null); + Cache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -195,7 +195,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testNearPut() throws Exception { Ignite g0 = grid(0); - GridCache<Integer, Integer> cache0 = g0.cache(null); + Cache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -245,7 +245,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testPrimaryRead() throws Exception { Ignite g0 = grid(0); - GridCache<Integer, Integer> cache0 = g0.cache(null); + Cache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -299,7 +299,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testBackupRead() throws Exception { Ignite g0 = grid(0); - GridCache<Integer, Integer> cache0 = g0.cache(null); + Cache<Integer, Integer> cache0 = g0.cache(null); int key; @@ -348,7 +348,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { public void testNearRead() throws Exception { Ignite g0 = grid(0); - GridCache<Integer, Integer> cache0 = g0.cache(null); + Cache<Integer, Integer> cache0 = g0.cache(null); int 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/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index d6c4354..f751bef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -32,8 +32,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.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -67,7 +67,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setPreloadMode(NONE); @@ -102,7 +102,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); - GridCache<Integer, String> c = g.cache(null); + Cache<Integer, String> c = g.cache(null); c.removeAll(); @@ -220,7 +220,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { */ private void checkDoubleGet(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { - GridCache<Integer, String> cache = grid(0).cache(null); + Cache<Integer, String> cache = grid(0).cache(null); Integer key = 1; @@ -235,7 +235,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { if (isTestDebug()) { info("Started transaction."); - GridCacheAffinity<Integer> aff = cache.affinity(); + CacheAffinity<Integer> aff = cache.affinity(); int part = aff.partition(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/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index a29123d..dbdc689 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.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.cluster.*; @@ -35,7 +36,6 @@ 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 java.util.*; import java.util.concurrent.*; @@ -43,7 +43,7 @@ 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.CacheDistributionMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -68,7 +68,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { private AtomicInteger cntr = new AtomicInteger(0); /** Affinity based on node index mode. */ - private GridCacheAffinityFunction aff = new GridCacheModuloAffinityFunction(GRID_CNT, BACKUPS); + private CacheAffinityFunction aff = new GridCacheModuloAffinityFunction(GRID_CNT, BACKUPS); /** Debug flag for mappings. */ private boolean mapDebug = true; @@ -99,7 +99,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); cacheCfg.setLoadPreviousValue(true); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinity(aff); cacheCfg.setAtomicityMode(atomicityMode()); cacheCfg.setBackups(BACKUPS); @@ -180,7 +180,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { * @param g Grid. * @return Near cache. */ - private GridCacheProjection<Integer, String> cache(Ignite g) { + private CacheProjection<Integer, String> cache(Ignite g) { return g.cache(null); } @@ -206,13 +206,13 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { * @param idx Index. * @return Affinity. */ - private GridCacheAffinity<Object> affinity(int idx) { + private CacheAffinity<Object> affinity(int idx) { return grid(idx).cache(null).affinity(); } /** @param cnt Count. */ private void mapKeys(int cnt) { - GridCacheAffinity<Object> aff = affinity(0); + CacheAffinity<Object> aff = affinity(0); for (int key = 1; key <= cnt; key++) { Integer part = aff.partition(key); @@ -336,7 +336,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { info("Local node: " + U.toShortString(loc)); - GridCache<Integer, String> near = cache(0); + Cache<Integer, String> near = cache(0); int cnt = 10; @@ -361,7 +361,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { assert ((Collection)n.meta("primary")).contains(key); - GridCache<Integer, String> dhtCache = dht(G.ignite(n.id())); + Cache<Integer, String> dhtCache = dht(G.ignite(n.id())); String s = dhtCache.peek(key); @@ -377,7 +377,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"ConstantConditions"}) public void testOptimisticWriteThrough() throws Exception { - GridCache<Integer, String> near = cache(0); + Cache<Integer, String> near = cache(0); if (transactional()) { try (IgniteTx tx = near.txStart(OPTIMISTIC, REPEATABLE_READ, 0, 0)) { @@ -422,7 +422,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testNoTransactionSinglePutx() throws Exception { - GridCache<Integer, String> near = cache(0); + Cache<Integer, String> near = cache(0); near.putx(2, "2"); @@ -439,7 +439,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testNoTransactionSinglePut() throws Exception { - GridCache<Integer, String> near = cache(0); + Cache<Integer, String> near = cache(0); // There should be a not-null previously mapped value because // we use a store implementation that just returns values which @@ -481,7 +481,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testNoTransactionWriteThrough() throws Exception { - GridCache<Integer, String> near = cache(0); + Cache<Integer, String> near = cache(0); near.putx(2, "2"); @@ -510,7 +510,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"ConstantConditions"}) public void testPessimisticWriteThrough() throws Exception { - GridCache<Integer, String> near = cache(0); + Cache<Integer, String> near = cache(0); if (transactional()) { try (IgniteTx tx = near.txStart(PESSIMISTIC, REPEATABLE_READ, 0, 0)) { @@ -557,7 +557,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { // Don't create missing values. store.create(false); - GridCache<Integer, String> near = cache(0); + Cache<Integer, String> near = cache(0); int key = 1; @@ -598,7 +598,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkBackupConsistency(int key) throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); String val = Integer.toString(key); @@ -652,7 +652,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { if (!transactional()) return; - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); String val = Integer.toString(key); @@ -810,7 +810,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkTransactionSingleGet(int key) throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); String val = Integer.toString(key); @@ -856,7 +856,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void checkTransactionSingleGetRemove(int key) throws Exception { - GridCache<Integer, String> cache = cache(0); + Cache<Integer, String> cache = cache(0); String val = Integer.toString(key); @@ -955,7 +955,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { } /** {@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) { map.put(e.getKey(), e.getValue()); } 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/GridCacheNearOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java index 2b1b127..f02bee0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.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.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; @@ -27,13 +28,12 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.transactions.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.concurrent.*; import java.util.concurrent.locks.*; 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.*; @@ -81,7 +81,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cacheCfg.setReadThrough(true); @@ -95,7 +95,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testRemove() throws Exception { - GridCache<Integer, String> near = cache(); + Cache<Integer, String> near = cache(); assertEquals("DHT entries: " + dht().entries(), 0, dht().size()); assertEquals("Near entries: " + near().entries(), 0, near().size()); @@ -123,9 +123,9 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testReadThrough() throws Exception { - GridCache<Integer, String> near = cache(); + Cache<Integer, String> near = cache(); - GridCache<Integer, String> dht = dht(); + Cache<Integer, String> dht = dht(); String s = near.get(1); @@ -153,7 +153,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"ConstantConditions"}) public void testOptimisticTxWriteThrough() throws Exception { - GridCache<Integer, String> near = cache(); + Cache<Integer, String> near = cache(); GridCacheAdapter<Integer, String> dht = dht(); try (IgniteTx tx = cache().txStart(OPTIMISTIC, REPEATABLE_READ) ) { @@ -279,7 +279,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testTransactionSingleGet() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); cache.put(1, "val1"); @@ -298,7 +298,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testTransactionSingleGetRemove() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); cache.put(1, "val1"); @@ -378,7 +378,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { } /** {@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) { map.put(e.getKey(), e.getValue()); } 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/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index fffafc7..3452309 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -33,8 +33,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; /** @@ -110,14 +110,14 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio /** * @return For the purpose of this test returns the near-only instance. */ - @Override protected GridCache<String, Integer> cache() { + @Override protected Cache<String, Integer> cache() { return cache(nearIdx); } /** * @return A not near-only cache. */ - protected GridCache<String, Integer> fullCache() { + protected Cache<String, Integer> fullCache() { return nearIdx == 0 ? cache(1) : cache(0); } @@ -127,7 +127,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio * * {@inheritDoc} */ - @Override protected List<String> primaryKeysForCache(GridCacheProjection<String, Integer> cache, int cnt) + @Override protected List<String> primaryKeysForCache(CacheProjection<String, Integer> cache, int cnt) throws IgniteCheckedException { return cache.equals(cache()) ? super.primaryKeysForCache(fullCache(), cnt) : super.primaryKeysForCache(cache, cnt); @@ -135,7 +135,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio /** {@inheritDoc} */ @Override public void testSize() throws Exception { - GridCache<String, Integer> nearCache = cache(); + Cache<String, Integer> nearCache = cache(); int size = 10; @@ -211,8 +211,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio /** {@inheritDoc} */ @Override public void testClear() throws Exception { - GridCache<String, Integer> nearCache = cache(); - GridCache<String, Integer> primary = fullCache(); + Cache<String, Integer> nearCache = cache(); + Cache<String, Integer> primary = fullCache(); Collection<String> keys = primaryKeysForCache(primary, 3); @@ -295,8 +295,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio /** {@inheritDoc} */ @Override public void testClearKeys() throws Exception { - GridCache<String, Integer> nearCache = cache(); - GridCache<String, Integer> primary = fullCache(); + Cache<String, Integer> nearCache = cache(); + Cache<String, Integer> primary = fullCache(); Collection<String> keys = primaryKeysForCache(primary, 3); @@ -383,8 +383,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio } }, EVT_CACHE_OBJECT_LOCKED, EVT_CACHE_OBJECT_UNLOCKED); - GridCache<String, Integer> nearCache = cache(); - GridCache<String, Integer> cache = fullCache(); + Cache<String, Integer> nearCache = cache(); + Cache<String, Integer> cache = fullCache(); String key = primaryKeysForCache(cache, 1).get(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/near/GridCacheNearOnlySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java index 63bcfa2..90f0e13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Near only self test. */ public class GridCacheNearOnlySelfTest extends GridCacheClientModesAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } @@ -40,14 +40,14 @@ public class GridCacheNearOnlySelfTest extends GridCacheClientModesAbstractSelfT * @throws Exception If failed. */ public void testUpdateNearOnlyReader() throws Exception { - GridCache<Object, Object> dhtCache = dhtCache(); + Cache<Object, Object> dhtCache = dhtCache(); final int keyCnt = 100; for (int i = 0; i < keyCnt; i++) dhtCache.put(i, i); - GridCache<Object, Object> nearOnlyCache = nearOnlyCache(); + Cache<Object, Object> nearOnlyCache = nearOnlyCache(); for (int i = 0; i < keyCnt; i++) { assertNull(nearOnlyCache.peek(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/GridCacheNearOnlyTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java index bcc3ab8..75dfe1c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java @@ -32,8 +32,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.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -160,7 +160,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { for (int i = 0; i < 10; i++) grid(1).cache(null).put(i, i); - final GridCache<Object, Object> nearOnly = grid(0).cache(null); + final Cache<Object, Object> nearOnly = grid(0).cache(null); // Populate near cache. for (int i = 0; i < 10; 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/GridCacheNearPartitionedClearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java index efa74d3..5fa77d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java @@ -33,9 +33,9 @@ import javax.cache.configuration.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test clear operation in NEAR_PARTITIONED transactional cache. @@ -104,7 +104,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testClear() throws Exception { - GridCache cache = cacheForIndex(0); + Cache cache = cacheForIndex(0); int key = primaryKey0(grid(0), cache); @@ -112,7 +112,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes cache.clear(key); for (int i = 0; i < GRID_CNT; i++) { - GridCache cache0 = cacheForIndex(i); + Cache cache0 = cacheForIndex(i); cache0.removeAll(); @@ -132,7 +132,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes * @return Primary key. * @throws Exception If failed. */ - private int primaryKey0(Ignite ignite, GridCache cache) throws Exception { + private int primaryKey0(Ignite ignite, Cache cache) throws Exception { ClusterNode locNode = ignite.cluster().localNode(); for (int i = 0; i < Integer.MAX_VALUE; i++) { @@ -149,7 +149,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes * @param idx Index. * @return Cache. */ - private GridCache cacheForIndex(int idx) { + private Cache cacheForIndex(int idx) { return grid(idx).cache(CACHE_NAME); } } 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/GridCacheNearPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPrimarySyncSelfTest.java index 7337b6c..d2c58c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPrimarySyncSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Test ensuring that PRIMARY_SYNC mode works correctly for co-located cache. */ public class GridCacheNearPrimarySyncSelfTest extends GridCacheAbstractPrimarySyncSelfTest { /** {@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/GridCacheNearReaderPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java index 3c99249..69e681d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java @@ -30,9 +30,9 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * We have three nodes - A, B and C - and start them in that order. Each node contains NEAR_PARTITIONED transactional @@ -51,13 +51,13 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest { private static final String CACHE_NAME = "cache"; /** Cache on primary node. */ - private GridCache<Integer, Integer> cache1; + private Cache<Integer, Integer> cache1; /** Cache on near node. */ - private GridCache<Integer, Integer> cache2; + private Cache<Integer, Integer> cache2; /** Cache on backup node. */ - private GridCache<Integer, Integer> cache3; + private Cache<Integer, Integer> cache3; /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { @@ -190,8 +190,8 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest { * @param expVal Expected value. * @throws Exception If failed. */ - private void checkCache(GridCacheProjection<Integer, Integer> cache, int key, int expVal) throws Exception { - GridCacheEntry<Integer, Integer> entry = cache.entry(key); + private void checkCache(CacheProjection<Integer, Integer> cache, int key, int expVal) throws Exception { + CacheEntry<Integer, Integer> entry = cache.entry(key); assert F.eq(expVal, entry.getValue()) : "Unexpected cache value [key=" + key + ", expected=" + expVal + ", actual=" + entry.getValue() + ", primary=" + entry.primary() + ", backup=" + entry.backup() + ']';
