http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java index a378db7..ce53047 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java @@ -30,7 +30,7 @@ import javax.cache.expiry.*; import java.util.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -75,7 +75,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testExpiredEntriesPreloading() throws Exception { - GridCache<String, Integer> cache0 = cache(0); + Cache<String, Integer> cache0 = cache(0); final int KEYS_NUM = 3;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index d5ba673..9cf3c0d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -32,9 +32,9 @@ import java.util.*; import java.util.concurrent.*; 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 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/GridCacheMixedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java index 014878d..372c4db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java @@ -45,7 +45,7 @@ public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest { cfg.setCacheMode(CacheMode.PARTITIONED); if (F.eq(gridName, getTestGridName(0))) - cfg.setDistributionMode(GridCacheDistributionMode.NEAR_ONLY); + cfg.setDistributionMode(CacheDistributionMode.NEAR_ONLY); return cfg; } @@ -64,7 +64,7 @@ public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testBasicOps() throws Exception { - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < 1000; i++) cache.put(i, 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/GridCacheModuloAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java index 1cad96a..5f07043 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java @@ -27,7 +27,7 @@ import java.util.*; /** * Affinity which controls where nodes end up using mod operation. */ -public class GridCacheModuloAffinityFunction implements GridCacheAffinityFunction { +public class GridCacheModuloAffinityFunction implements CacheAffinityFunction { /** Node attribute for index. */ public static final String IDX_ATTR = "nodeIndex"; @@ -83,7 +83,7 @@ public class GridCacheModuloAffinityFunction implements GridCacheAffinityFunctio /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext ctx) { + @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext ctx) { List<List<ClusterNode>> res = new ArrayList<>(parts); Collection<ClusterNode> topSnapshot = ctx.currentTopologySnapshot(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index 6d3351b..0aec12f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -50,13 +50,13 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT private static Ignite ignite3; /** Cache 1. */ - private static GridCache<Integer, String> cache1; + private static Cache<Integer, String> cache1; /** Cache 2. */ - private static GridCache<Integer, String> cache2; + private static Cache<Integer, String> cache2; /** Cache 3. */ - private static GridCache<Integer, String> cache3; + private static Cache<Integer, String> cache3; /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -182,7 +182,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT for (Ignite ignite : ignites) addListener(ignite, lsnr); - GridCache<Integer, String> cache1 = ignites[0].cache(null); + Cache<Integer, String> cache1 = ignites[0].cache(null); for (int i = 1; i <= cnt; i++) cache1.put(i, "val" + i); @@ -197,7 +197,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT latch.await(10, SECONDS); for (Ignite ignite : ignites) { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); if (cache == cache1) continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 827f19d..0e689af 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -137,7 +137,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param cache Cache. * @param key Key. */ - private void checkLocked(GridCacheProjection<Integer,String> cache, Integer key) { + private void checkLocked(CacheProjection<Integer,String> cache, Integer key) { assert cache.isLocked(key); assert cache.isLockedByThread(key); } @@ -155,7 +155,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param cache Cache. * @param key Key. */ - private void checkRemoteLocked(GridCacheProjection<Integer,String> cache, Integer key) { + private void checkRemoteLocked(CacheProjection<Integer,String> cache, Integer key) { assert cache.isLocked(key); assert !cache.isLockedByThread(key); } @@ -174,7 +174,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param key Key. */ @SuppressWarnings({"BusyWait"}) - private void checkUnlocked(GridCacheProjection<Integer,String> cache, Integer key) { + private void checkUnlocked(CacheProjection<Integer,String> cache, Integer key) { assert !cache.isLockedByThread(key); if (partitioned()) { @@ -222,7 +222,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param cache Cache. * @param keys Keys. */ - private void checkLocked(GridCacheProjection<Integer,String> cache, Iterable<Integer> keys) { + private void checkLocked(CacheProjection<Integer,String> cache, Iterable<Integer> keys) { for (Integer key : keys) { checkLocked(cache, key); } @@ -241,7 +241,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param cache Cache. * @param keys Keys. */ - private void checkRemoteLocked(GridCacheProjection<Integer,String> cache, Iterable<Integer> keys) { + private void checkRemoteLocked(CacheProjection<Integer,String> cache, Iterable<Integer> keys) { for (Integer key : keys) { checkRemoteLocked(cache, key); } @@ -261,7 +261,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param cache Cache. * @param keys Keys. */ - private void checkUnlocked(GridCacheProjection<Integer,String> cache, Iterable<Integer> keys) { + private void checkUnlocked(CacheProjection<Integer,String> cache, Iterable<Integer> keys) { for (Integer key : keys) checkUnlocked(cache, 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/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 4bd6f54..2f995f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -40,9 +40,9 @@ import java.util.concurrent.locks.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Base test for all multithreaded cache scenarios w/ and w/o failover. @@ -124,7 +124,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra /** * @return Distribution mode. */ - protected GridCacheDistributionMode distributionMode() { + protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } @@ -277,7 +277,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra Ignite ignite = G.ignite(nodeName(0)); - GridCache<Integer, Integer> cache = ignite.cache(CACHE_NAME); + Cache<Integer, Integer> cache = ignite.cache(CACHE_NAME); int startKey = keysPerThread * idx; int endKey = keysPerThread * (idx + 1); @@ -500,11 +500,11 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra */ @SuppressWarnings({"TooBroadScope", "ConstantIfStatement"}) private boolean compareCaches(Map<Integer, Integer> expVals) throws Exception { - List<GridCache<Integer, Integer>> caches = new ArrayList<>(dataNodes()); + List<Cache<Integer, Integer>> caches = new ArrayList<>(dataNodes()); List<GridDhtCacheAdapter<Integer, Integer>> dhtCaches = null; for (int i = 0 ; i < dataNodes(); i++) { - GridCache<Integer, Integer> cache = G.ignite(nodeName(i)).cache(CACHE_NAME); + Cache<Integer, Integer> cache = G.ignite(nodeName(i)).cache(CACHE_NAME); assert cache != null; @@ -587,7 +587,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra for (Integer key : failedKeys) { for (int i = 0; i < dataNodes(); i++) { - GridCacheEntry<Integer, Integer> cacheEntry = caches.get(i).entry(key); + CacheEntry<Integer, Integer> cacheEntry = caches.get(i).entry(key); UUID nodeId = G.ignite(nodeName(i)).cluster().localNode().id(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 5399ea5..d0a4175 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -112,7 +112,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac IGNITEs.set(i, startGrid(i)); } - GridCacheEntry e = cache(i).entry(KEY); + CacheEntry e = cache(i).entry(KEY); assert !e.isLocked() : "Entry is locked for grid [idx=" + i + ", entry=" + e + ']'; } @@ -122,7 +122,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac * @param i Grid index. * @return Cache. */ - @Override protected <K, V> GridCache<K, V> cache(int i) { + @Override protected <K, V> Cache<K, V> cache(int i) { return IGNITEs.get(i).cache(null); } @@ -163,7 +163,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac Ignite g = grid(idx); - GridCache<Integer, String> cache = cache(idx); + Cache<Integer, String> cache = cache(idx); IgniteTx tx = cache.txStart(concurrency, isolation); @@ -188,7 +188,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac U.sleep(getInteger(GG_TX_SALVAGE_TIMEOUT, 3000)); - GridCache<Integer, String> checkCache = cache(checkIdx); + Cache<Integer, String> checkCache = cache(checkIdx); boolean locked = false; @@ -237,7 +237,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac info("Nodes for key [id=" + grid(idx).cache(null).affinity().mapKeyToPrimaryAndBackups(KEY) + ", key=" + KEY + ']'); - GridCache<Integer, String> cache = cache(idx); + Cache<Integer, String> cache = cache(idx); // TODO: GG-7437. if (cache.configuration().getCacheMode() == CacheMode.REPLICATED) @@ -251,11 +251,11 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac 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 + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java index 3d1d0de..9392386 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java @@ -33,8 +33,8 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Partitioned affinity test. @@ -66,7 +66,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheConsistentHashAffinityFunction aff = new CacheConsistentHashAffinityFunction(); aff.setBackupFilter(backupFilter); @@ -75,7 +75,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(BACKUPS); cacheCfg.setAffinity(aff); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setPreloadMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); @@ -122,11 +122,11 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra * @throws Exception If failed. */ private void checkPartitions() throws Exception { - int partCnt = GridCacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT; + int partCnt = CacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT; - GridCacheAffinityFunction aff = cacheConfiguration(grid(0).configuration(), null).getAffinity(); + CacheAffinityFunction aff = cacheConfiguration(grid(0).configuration(), null).getAffinity(); - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < partCnt; i++) { assertEquals(i, aff.partition(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/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index fa7a340..31eef8d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed; 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.lang.*; @@ -30,14 +31,13 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheMode.*; -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.*; /** * Check reloadAll() on partitioned cache. @@ -56,7 +56,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid private final Map<Integer, String> map = new ConcurrentHashMap8<>(); /** Collection of caches, one per grid node. */ - private List<GridCache<Integer, String>> caches; + private List<Cache<Integer, String>> caches; /** {@inheritDoc} */ @SuppressWarnings("unchecked") @@ -168,7 +168,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid return map.get(key); } - @Override public void write(Cache.Entry<? extends Integer, ? extends String> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Integer, ? extends String> e) { fail("Should not be called within the test."); } @@ -186,7 +186,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid */ public void testReloadAll() throws Exception { // Fill caches with values. - for (GridCache<Integer, String> cache : caches) { + for (Cache<Integer, String> cache : caches) { Iterable<Integer> keys = primaryKeysForCache(cache, 100); info("Values [cache=" + caches.indexOf(cache) + ", size=" + F.size(keys.iterator()) + ", keys=" + keys + "]"); @@ -195,14 +195,14 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid map.put(key, "val" + key); } - Collection<GridCache<Integer, String>> emptyCaches = new ArrayList<>(caches); + Collection<Cache<Integer, String>> emptyCaches = new ArrayList<>(caches); - for (GridCache<Integer, String> cache : caches) { + for (Cache<Integer, String> cache : caches) { info("Reloading cache: " + caches.indexOf(cache)); // Check data is reloaded only on the nodes on which reloadAll() has been called. if (!nearEnabled()) { - for (GridCache<Integer, String> eCache : emptyCaches) + for (Cache<Integer, String> eCache : emptyCaches) assertEquals("Non-null values found in cache [cache=" + caches.indexOf(eCache) + ", size=" + eCache.size() + ", size=" + eCache.size() + ", entrySetSize=" + eCache.entrySet().size() + "]", @@ -212,7 +212,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid cache.reloadAll(map.keySet()); for (Integer key : map.keySet()) { - GridCacheEntry entry = cache.entry(key); + CacheEntry entry = cache.entry(key); if (entry.primary() || entry.backup() || nearEnabled()) assertEquals(map.get(key), cache.peek(key)); @@ -231,7 +231,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid * @param cnt Keys count. * @return Collection of keys for which given cache is primary. */ - private Iterable<Integer> primaryKeysForCache(GridCacheProjection<Integer,String> cache, int cnt) { + private Iterable<Integer> primaryKeysForCache(CacheProjection<Integer,String> cache, int cnt) { Collection<Integer> found = new ArrayList<>(cnt); for (int i = 0; i < 10000; 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/GridCachePreloadEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java index 9333b17..0d1bed6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java @@ -34,8 +34,8 @@ import java.util.*; 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.*; /** * @@ -96,7 +96,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA public void testPreloadEvents() throws Exception { Ignite g1 = startGrid("g1"); - GridCache<Integer, String> cache = g1.cache(null); + Cache<Integer, String> cache = g1.cache(null); cache.put(1, "val1"); cache.put(2, "val2"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index 92f59ff..1e5322f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -32,7 +32,7 @@ import java.io.*; import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Tests for cache preloader. @@ -43,10 +43,10 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb protected static final String TEST_STRING = "ABC"; /** */ - protected static final GridCachePreloadMode DFLT_PRELOAD_MODE = SYNC; + protected static final CachePreloadMode DFLT_PRELOAD_MODE = SYNC; /** */ - protected GridCachePreloadMode preloadMode = DFLT_PRELOAD_MODE; + protected CachePreloadMode preloadMode = DFLT_PRELOAD_MODE; /** */ protected LifecycleBean lifecycleBean; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index daf6b99..c19e8ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -32,9 +32,9 @@ import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheConfiguration.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.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 node restart. @@ -74,7 +74,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon private static volatile int idx = -1; /** Preload mode. */ - private GridCachePreloadMode preloadMode = ASYNC; + private CachePreloadMode preloadMode = ASYNC; /** */ private int preloadBatchSize = DFLT_BATCH_SIZE; @@ -114,7 +114,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon cc.setStartSize(20); cc.setPreloadMode(preloadMode); cc.setPreloadBatchSize(preloadBatchSize); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); cc.setBackups(backups); cc.setAtomicityMode(TRANSACTIONAL); @@ -210,14 +210,14 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon * @return Affinity. */ @SuppressWarnings({"unchecked"}) - private GridCacheAffinityFunction affinity(GridCache<Integer, ?> cache) { + private CacheAffinityFunction affinity(Cache<Integer, ?> cache) { return cache.configuration().getAffinity(); } /** * @param c Cache projection. */ - private void affinityBeforeStop(GridCache<Integer, String> c) { + private void affinityBeforeStop(Cache<Integer, String> c) { for (int key = 0; key < keyCnt; key++) { int part = affinity(c).partition(key); @@ -229,7 +229,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon /** * @param c Cache projection. */ - private void affinityAfterStart(GridCache<Integer, String> c) { + private void affinityAfterStart(Cache<Integer, String> c) { if (DEBUG) { for (int key = 0; key < keyCnt; key++) { int part = affinity(c).partition(key); @@ -249,7 +249,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon startGrids(); try { - GridCache<Integer, String> c = grid(idx).cache(CACHE_NAME); + Cache<Integer, String> c = grid(idx).cache(CACHE_NAME); for (int j = 0; j < retries; j++) { for (int i = 0; i < keyCnt; i++) @@ -286,7 +286,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon * @param attempt Attempt. * @throws Exception If failed. */ - private void checkGet(GridCache<Integer, String> c, int attempt) throws Exception { + private void checkGet(Cache<Integer, String> c, int attempt) throws Exception { for (int i = 0; i < keyCnt; i++) { String v = c.get(i); @@ -312,7 +312,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon * @param key Key. * @param attempt Attempt. */ - private void printFailureDetails(GridCache<Integer, String> c, int key, int attempt) { + private void printFailureDetails(Cache<Integer, String> c, int key, int attempt) { error("*** Failure details ***"); error("Key: " + key); error("Partition: " + c.configuration().getAffinity().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/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index f0c738f..18ef6d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; 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.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -117,7 +117,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { ccfg.setAtomicityMode(atomicityMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setAtomicWriteOrderMode(PRIMARY); - ccfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); + ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); if (cacheMode == PARTITIONED) ccfg.setBackups(BACKUP_CNT); @@ -242,7 +242,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { * @return {@code True} if grid is primary for given key. */ private boolean primary(int gridIdx, Object key) { - GridCacheAffinity<Object> aff = grid(0).cache(CACHE_NAME).affinity(); + CacheAffinity<Object> aff = grid(0).cache(CACHE_NAME).affinity(); return aff.isPrimary(grid(gridIdx).cluster().localNode(), key); } @@ -253,7 +253,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { * @return {@code True} if grid is primary for given key. */ private boolean backup(int gridIdx, Object key) { - GridCacheAffinity<Object> aff = grid(0).cache(CACHE_NAME).affinity(); + CacheAffinity<Object> aff = grid(0).cache(CACHE_NAME).affinity(); return aff.isBackup(grid(gridIdx).cluster().localNode(), 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/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index c89ff6b..08de5ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -31,10 +31,10 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.IgniteTxIsolation.REPEATABLE_READ; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -91,7 +91,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom /** * @return Partition distribution mode for PARTITIONED cache. */ - protected abstract GridCacheDistributionMode partitionDistributionMode(); + protected abstract CacheDistributionMode partitionDistributionMode(); /** * @throws Exception If failed. @@ -145,7 +145,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom try { GridKernal grid = (GridKernal)grid(idx); - GridCache<Integer, Integer> cache = grid.cache(null); + Cache<Integer, Integer> cache = grid.cache(null); List<Integer> keys = new ArrayList<>(); @@ -183,7 +183,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom for (int i = 0; i < GRID_CNT; i++) { GridEx grid = grid(i); - GridCache<Integer, Integer> cache = grid.cache(null); + Cache<Integer, Integer> cache = grid.cache(null); if (cache.affinity().isPrimaryOrBackup(grid.localNode(), k)) { if (val == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 476b465..0fe8eb2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -152,7 +152,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri GridTestUtils.runAsync(new Callable<Object>() { @Override public Object call() throws Exception { - GridCache<Integer, String> cache = txIgniteNode.cache(null); + Cache<Integer, String> cache = txIgniteNode.cache(null); assertNotNull(cache); @@ -212,7 +212,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri private Ignite ignite; @Override public Void call() throws Exception { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index 4d8fee4..17dd8ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -175,7 +175,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - GridCache<Integer, String> cache = originatingNodeGrid.cache(null); + Cache<Integer, String> cache = originatingNodeGrid.cache(null); assertNotNull(cache); @@ -251,7 +251,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest private Ignite ignite; @Override public Void call() throws Exception { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); @@ -305,7 +305,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest Map<Integer, Collection<ClusterNode>> nodeMap = new HashMap<>(); - GridCache<Integer, String> cache = grid(0).cache(null); + Cache<Integer, String> cache = grid(0).cache(null); info("Failing node ID: " + grid(1).localNode().id()); @@ -382,7 +382,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest private Ignite ignite; @Override public Void call() throws Exception { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 5a08d3b..7f62202 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -31,8 +31,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -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 transaction during cache 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/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index 80ba5f2..bac9625 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -64,7 +64,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { * @param i Grid index. * @return Cache. */ - @Override protected <K, V> GridCache<K, V> cache(int i) { + @Override protected <K, V> Cache<K, V> cache(int i) { return IGNITEs.get(i).cache(null); } @@ -120,7 +120,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { int idx = RAND.nextInt(GRID_COUNT); - GridCache<Integer, String> cache = cache(idx); + Cache<Integer, String> cache = cache(idx); IgniteTx tx = cache.txStart(concurrency, isolation, TIMEOUT, 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/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java index 279cfd6..7cf7a3d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.spi.swapspace.file.*; 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.junit.Assert.*; /** @@ -42,13 +42,13 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex protected static final String CACHE_ATOMIC_OFFHEAP_TIERED = "cache_atomic_offheap_tiered"; /** Atomic caches. */ - private static GridCache<Integer, Object>[] cachesAtomic; + private static Cache<Integer, Object>[] cachesAtomic; /** Atomic offheap caches. */ - private static GridCache<Integer, Object>[] cachesAtomicOffheap; + private static Cache<Integer, Object>[] cachesAtomicOffheap; /** Atomic offheap caches. */ - private static GridCache<Integer, Object>[] cachesAtomicOffheapTiered; + private static Cache<Integer, Object>[] cachesAtomicOffheapTiered; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -87,7 +87,7 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -98,9 +98,9 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex int gridCnt = gridCount(); - cachesAtomic = new GridCache[gridCnt]; - cachesAtomicOffheap = new GridCache[gridCnt]; - cachesAtomicOffheapTiered = new GridCache[gridCnt]; + cachesAtomic = new Cache[gridCnt]; + cachesAtomicOffheap = new Cache[gridCnt]; + cachesAtomicOffheapTiered = new Cache[gridCnt]; for (int i = 0; i < gridCount(); i++) { cachesAtomic[i] = ignites[i].cache(CACHE_ATOMIC); @@ -151,13 +151,13 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex * @param caches Caches. * @throws Exception If failed. */ - private void testAtomic0(GridCache<Integer, Object>[] caches) throws Exception { + private void testAtomic0(Cache<Integer, Object>[] caches) throws Exception { byte[] val = wrap(1); - for (GridCache<Integer, Object> cache : caches) { + for (Cache<Integer, Object> cache : caches) { cache.put(KEY_1, val); - for (GridCache<Integer, Object> cacheInner : caches) + for (Cache<Integer, Object> cacheInner : caches) assertArrayEquals(val, (byte[])cacheInner.get(KEY_1)); cache.remove(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/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index 963292d..dc8f159 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java @@ -34,7 +34,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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; 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/GridCacheAtomicExpiredEntriesPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java index d1ec90b..1cd2b55 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java @@ -22,7 +22,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 preloading of expired entries. @@ -39,7 +39,7 @@ public class GridCacheAtomicExpiredEntriesPreloadSelfTest extends GridCacheExpir } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java index cc47636..4a817cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java @@ -25,7 +25,7 @@ import java.util.*; 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 test for disabled near cache. @@ -44,7 +44,7 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index 6bceecf..1049442 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@ -35,10 +35,10 @@ import java.util.*; 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.*; import static org.apache.ignite.internal.GridNodeAttributes.*; /** @@ -161,9 +161,9 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - GridCache<Integer, Integer> cache0 = ignite0.cache(null); + Cache<Integer, Integer> cache0 = ignite0.cache(null); - GridCacheAffinity<Integer> aff = cache0.affinity(); + CacheAffinity<Integer> aff = cache0.affinity(); UUID id0 = ignite0.cluster().localNode().id(); @@ -224,7 +224,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - GridCache<Integer, Integer> cache = grid(i).cache(null); + Cache<Integer, Integer> cache = grid(i).cache(null); for (Integer key : nearKeys.keySet()) nearKeys.put(key, val); @@ -265,7 +265,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); - GridCacheAffinity<Object> aff = cache(0).affinity(); + CacheAffinity<Object> aff = cache(0).affinity(); UUID id0 = ignite0.cluster().localNode().id(); @@ -342,7 +342,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, Integer> cache0 = ignite0.jcache(null); - GridCacheAffinity<Object> aff = ignite0.cache(null).affinity(); + CacheAffinity<Object> aff = ignite0.cache(null).affinity(); UUID id0 = ignite0.cluster().localNode().id(); @@ -439,7 +439,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private void checkPutRemoveGet() throws Exception { Ignite ignite0 = grid(0); - GridCache<Integer, Integer> cache0 = ignite0.cache(null); + Cache<Integer, Integer> cache0 = ignite0.cache(null); Integer key = key(ignite0, NOT_PRIMARY_AND_BACKUP); @@ -477,9 +477,9 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(grid); - GridCache<Integer, Integer> cache0 = ignite0.cache(null); + Cache<Integer, Integer> cache0 = ignite0.cache(null); - GridCacheAffinity<Integer> aff = cache0.affinity(); + CacheAffinity<Integer> aff = cache0.affinity(); UUID id0 = ignite0.cluster().localNode().id(); @@ -524,7 +524,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { delay(); - GridCache<Integer, Integer> cache = grid(i).cache(null); + Cache<Integer, Integer> cache = grid(i).cache(null); log.info("Put [grid=" + grid(i).name() + ", val=" + val + ']'); @@ -554,7 +554,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - GridCache<Integer, Integer> cache0 = ignite0.cache(null); + Cache<Integer, Integer> cache0 = ignite0.cache(null); Integer primaryKey = key(ignite0, PRIMARY); @@ -600,9 +600,9 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { Ignite ignite0 = grid(0); - GridCache<Integer, Integer> cache0 = ignite0.cache(null); + Cache<Integer, Integer> cache0 = ignite0.cache(null); - GridCacheAffinity<Integer> aff = cache0.affinity(); + CacheAffinity<Integer> aff = cache0.affinity(); UUID id0 = ignite0.cluster().localNode().id(); @@ -624,7 +624,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { checkEntry(grid(i), nearKey, 1, false, expReaders); } - GridCache<Integer, Integer> primaryCache = G.ignite( + Cache<Integer, Integer> primaryCache = G.ignite( (String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null); delay(); @@ -650,9 +650,9 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private void checkReaderRemove() throws Exception { Ignite ignite0 = grid(0); - GridCache<Integer, Integer> cache0 = ignite0.cache(null); + Cache<Integer, Integer> cache0 = ignite0.cache(null); - GridCacheAffinity<Integer> aff = cache0.affinity(); + CacheAffinity<Integer> aff = cache0.affinity(); UUID id0 = ignite0.cluster().localNode().id(); @@ -675,7 +675,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { delay(); - GridCache<Integer, Integer> primaryCache = primaryNode.cache(null); + Cache<Integer, Integer> primaryCache = primaryNode.cache(null); primaryCache.put(nearKey, 2); // Put from primary, check there are no readers. @@ -735,9 +735,9 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { * @return Key with properties specified by the given mode. */ private Integer key(Ignite ignite, int mode) { - GridCache<Integer, Integer> cache = ignite.cache(null); + Cache<Integer, Integer> cache = ignite.cache(null); - GridCacheAffinity<Integer> aff = cache.affinity(); + CacheAffinity<Integer> aff = cache.affinity(); Integer key = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledFullApiSelfTest.java index b835845..74ecac6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledFullApiSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests atomic cache with near cache enabled. */ public class GridCacheAtomicNearEnabledFullApiSelfTest extends GridCacheAtomicFullApiSelfTest { /** {@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/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java index 56ad5d2..b135748 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests atomic cache with near cache enabled. @@ -27,7 +27,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderFullApiSelfTest { /** {@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/GridCacheClientOnlySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java index 4434179..4990dff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Client only test. */ public class GridCacheClientOnlySelfTest extends GridCacheClientModesAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index cb12d5a..f6a3526 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -39,10 +39,10 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; 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.*; /** * Tests for colocated cache. @@ -72,7 +72,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(PARTITIONED_ONLY); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 30)); + cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 30)); cacheCfg.setBackups(1); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setSwapEnabled(false); 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/GridCacheColocatedFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java index 951da6e..da8c792 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.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.*; /** * Failover tests for colocated cache. @@ -33,7 +33,7 @@ public class GridCacheColocatedFailoverSelfTest extends GridCacheAbstractFailove } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index e15e8c2..ce8bb06 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -30,10 +30,10 @@ 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.*; 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.*; /** * Test ensuring that values are visible inside OPTIMISTIC transaction in co-located cache. @@ -58,7 +58,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA private static Ignite[] ignites; /** Regular caches. */ - private static GridCache<Integer, String>[] caches; + private static Cache<Integer, String>[] caches; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -93,7 +93,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA @SuppressWarnings("unchecked") @Override protected void beforeTest() throws Exception { ignites = new Ignite[GRID_CNT]; - caches = new GridCache[GRID_CNT]; + caches = new Cache[GRID_CNT]; for (int i = 0; i < GRID_CNT; i++) { ignites[i] = startGrid(i); @@ -116,7 +116,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA * @throws Exception If failed. */ public void testOptimisticTransaction() throws Exception { - for (GridCache<Integer, String> cache : caches) { + for (Cache<Integer, String> cache : caches) { IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ); try { @@ -128,7 +128,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA tx.close(); } - for (GridCache<Integer, String> cacheInner : caches) { + for (Cache<Integer, String> cacheInner : caches) { tx = cacheInner.txStart(OPTIMISTIC, REPEATABLE_READ); try { 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/GridCacheColocatedPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedPrimarySyncSelfTest.java index f092eb7..7bdb7d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedPrimarySyncSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -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 GridCacheColocatedPrimarySyncSelfTest extends GridCacheAbstractPrimarySyncSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java index 112cb47..f53e7be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.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 colocated cache. @@ -33,7 +33,7 @@ public class GridCacheColocatedTxExceptionSelfTest extends IgniteTxExceptionAbst } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java index aed57fa..c93cb46 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Test pessimistic tx failures in colocated cache. @@ -43,7 +43,7 @@ public class GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest exten } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java index 15fb8b1..93da8db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; 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.CachePreloadMode.*; /** * Test txs in single-threaded mode for colocated cache. @@ -50,12 +50,12 @@ public class GridCacheColocatedTxSingleThreadedSelfTest extends IgniteTxSingleTh cc.setCacheMode(PARTITIONED); cc.setBackups(1); - cc.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); + cc.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); cc.setAtomicityMode(TRANSACTIONAL); cc.setEvictionPolicy(null); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_ASYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC); cc.setPreloadMode(NONE); 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/GridCacheDhtAtomicRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java index 50589fe..29bff17 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java @@ -22,7 +22,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.*; /** * Tests that removes are not lost when topology changes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java index 32ca52b..1e0ae74 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java @@ -37,7 +37,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.*; /** * Unit tests for dht entry. @@ -62,9 +62,9 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10)); + cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10)); cacheCfg.setBackups(0); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(false); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); @@ -100,7 +100,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { @SuppressWarnings({"SizeReplaceableByIsEmpty"}) @Override protected void afterTest() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - near(grid(i)).removeAll(F.<GridCacheEntry<Integer, String>>alwaysTrue()); + near(grid(i)).removeAll(F.<CacheEntry<Integer, String>>alwaysTrue()); assertEquals("Near cache size is not zero for grid: " + i, 0, near(grid(i)).size()); assertEquals("DHT cache size is not zero for grid: " + i, 0, dht(grid(i)).size()); @@ -121,7 +121,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { * @param g Grid. * @return Near cache. */ - private GridCacheProjection<Integer, String> near(Ignite g) { + private CacheProjection<Integer, String> near(Ignite g) { return g.cache(null); } @@ -151,8 +151,8 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { ClusterNode primary = t.get1(); ClusterNode other = t.get2(); - GridCacheProjection<Integer, String> near0 = near(grid(primary.id())); - GridCacheProjection<Integer, String> near1 = near(grid(other.id())); + CacheProjection<Integer, String> near0 = near(grid(primary.id())); + CacheProjection<Integer, String> near1 = near(grid(other.id())); assert near0 != near1; @@ -196,8 +196,8 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { ClusterNode primary = t.get1(); ClusterNode other = t.get2(); - GridCacheProjection<Integer, String> near0 = near(grid(primary.id())); - GridCacheProjection<Integer, String> near1 = near(grid(other.id())); + CacheProjection<Integer, String> near0 = near(grid(primary.id())); + CacheProjection<Integer, String> near1 = near(grid(other.id())); assert near0 != near1; @@ -242,8 +242,8 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { ClusterNode primary = t.get1(); ClusterNode other = t.get2(); - GridCacheProjection<Integer, String> near0 = near(grid(primary.id())); - GridCacheProjection<Integer, String> near1 = near(grid(other.id())); + CacheProjection<Integer, String> near0 = near(grid(primary.id())); + CacheProjection<Integer, String> near1 = near(grid(other.id())); assert near0 != near1; @@ -291,7 +291,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { * @return For the given key pair {primary node, some other node}. */ private IgniteBiTuple<ClusterNode, ClusterNode> getNodes(Integer key) { - GridCacheAffinity<Integer> aff = grid(0).<Integer, Object>cache(null).affinity(); + CacheAffinity<Integer> aff = grid(0).<Integer, Object>cache(null).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/dht/GridCacheDhtEntrySetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java index ecb466a..cc089b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.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.*; /** *
