http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java index d3c1744..c605840 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java @@ -33,9 +33,9 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.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.*; /** * Basic get and transform store test. @@ -102,7 +102,7 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm /** * @return Distribution mode. */ - protected GridCacheDistributionMode distributionMode() { + 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/GridCacheGlobalClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java index 0cc4209..9fd3039 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java @@ -25,11 +25,11 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Test {@link org.apache.ignite.cache.GridCache#globalClearAll()} operation in multinode environment with nodes + * Test {@link org.apache.ignite.cache.Cache#globalClearAll()} operation in multinode environment with nodes * having caches with different names. */ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest { @@ -147,7 +147,7 @@ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest { // Check cache sizes. for (int i = 0; i < GRID_CNT - 1; i++) { - GridCache<Object, Object> cache = grid(i).cache(CACHE_NAME); + Cache<Object, Object> cache = grid(i).cache(CACHE_NAME); assertEquals("Key set [i=" + i + ", keys=" + cache.keySet() + ']', KEY_CNT, cache.size()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index 89f7234..a4b2845 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -44,7 +45,7 @@ import java.util.concurrent.atomic.*; 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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -81,7 +82,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr cacheCfg.setCacheMode(cacheMode()); cacheCfg.setDistributionMode(nearEnabled() ? NEAR_PARTITIONED : PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setCacheStoreFactory(new Factory<CacheStore<? super Object, ? super Object>>() { @@ -157,10 +158,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); - GridCacheAffinityKey<String> key1; - GridCacheAffinityKey<String> key2; + CacheAffinityKey<String> key1; + CacheAffinityKey<String> key2; try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { if (concurrency == PESSIMISTIC) @@ -170,8 +171,8 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr assertEquals("Unexpected number of unlock events: " + unlocks.affectedKeys(), 0, unlocks.affectedKeys().size()); - key1 = new GridCacheAffinityKey<>("key1", affinityKey); - key2 = new GridCacheAffinityKey<>("key2", affinityKey); + key1 = new CacheAffinityKey<>("key1", affinityKey); + key2 = new CacheAffinityKey<>("key2", affinityKey); cache.putAll(F.asMap( key1, "val1", @@ -188,7 +189,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -222,10 +223,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); // Populate cache. cache.putAll(F.asMap( @@ -236,7 +237,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -269,7 +270,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertNull("For index: " + i, gCache.peek(key1)); @@ -303,10 +304,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); // Populate cache. cache.putAll(F.asMap( @@ -317,7 +318,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -372,9 +373,9 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr final UUID affinityKey = primaryKeyForCache(grid(0)); - final GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); + final CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); - final IgniteCache<GridCacheAffinityKey<String>, String> cache = grid(0).jcache(null); + final IgniteCache<CacheAffinityKey<String>, String> cache = grid(0).jcache(null); // Populate cache. cache.put(key1, "val1"); @@ -382,7 +383,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -461,9 +462,9 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr final UUID affinityKey = primaryKeyForCache(grid); - final GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); + final CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); - final IgniteCache<GridCacheAffinityKey<String>, String> cache = grid.jcache(null); + final IgniteCache<CacheAffinityKey<String>, String> cache = grid.jcache(null); // Populate cache. cache.put(key1, "val1"); @@ -471,7 +472,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -489,7 +490,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val01", gCache.peek(key1)); @@ -527,7 +528,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCache<UUID, String> cache = grid(0).cache(null); + Cache<UUID, String> cache = grid(0).cache(null); UUID key1; UUID key2; @@ -573,7 +574,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -650,10 +651,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); // Populate cache. cache.putAll(F.asMap( @@ -664,7 +665,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -711,10 +712,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED); grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED); @@ -745,7 +746,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val01", gCache.peek(key1)); @@ -794,10 +795,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); // Populate cache. cache.putAll(F.asMap( @@ -808,7 +809,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -875,10 +876,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID affinityKey = primaryKeyForCache(grid(0)); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); // Populate cache. cache.putAll(F.asMap( @@ -889,7 +890,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -983,11 +984,11 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr private void checkGroupLockPutWrongKey(IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); - final GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + final Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); try (IgniteTx ignored = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { // Key with affinity key different from enlisted on tx start should raise exception. - cache.put(new GridCacheAffinityKey<>("key1", UUID.randomUUID()), "val1"); + cache.put(new CacheAffinityKey<>("key1", UUID.randomUUID()), "val1"); fail("Exception should be thrown"); } @@ -1019,9 +1020,9 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr private void checkGroupLockRemoveWrongKey(IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); - final GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + final Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); - final GridCacheAffinityKey<String> key = new GridCacheAffinityKey<>("key1", UUID.randomUUID()); + final CacheAffinityKey<String> key = new CacheAffinityKey<>("key1", UUID.randomUUID()); cache.put(key, "val"); @@ -1075,10 +1076,10 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); - final GridCache<Object, String> cache = grid(0).cache(null); + final Cache<Object, String> cache = grid(0).cache(null); - final GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - final GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); + final CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + final CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); cache.put(affinityKey, "0"); cache.put(key1, "0"); @@ -1126,14 +1127,14 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr private void checkGroupLockWriteThrough(IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); - GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, String> cache = grid(0).cache(null); - GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey); - GridCacheAffinityKey<String> key2 = new GridCacheAffinityKey<>("key2", affinityKey); - GridCacheAffinityKey<String> key3 = new GridCacheAffinityKey<>("key3", affinityKey); - GridCacheAffinityKey<String> key4 = new GridCacheAffinityKey<>("key4", affinityKey); + CacheAffinityKey<String> key1 = new CacheAffinityKey<>("key1", affinityKey); + CacheAffinityKey<String> key2 = new CacheAffinityKey<>("key2", affinityKey); + CacheAffinityKey<String> key3 = new CacheAffinityKey<>("key3", affinityKey); + CacheAffinityKey<String> key4 = new CacheAffinityKey<>("key4", affinityKey); - Map<GridCacheAffinityKey<String>, String> putMap = F.asMap( + Map<CacheAffinityKey<String>, String> putMap = F.asMap( key1, "val1", key2, "val2", key3, "val3", @@ -1151,7 +1152,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr for (int i = 0; i < gridCount(); i++) { Ignite g = grid(i); - GridCache<Object, Object> gCache = g.cache(null); + Cache<Object, Object> gCache = g.cache(null); if (gCache.affinity().isPrimaryOrBackup(g.cluster().localNode(), key1)) assertEquals("For index: " + i, "val1", gCache.peek(key1)); @@ -1295,15 +1296,15 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr } /** {@inheritDoc} */ - @Override public void writeAll(Collection<Cache.Entry<?, ?>> entries) { - for (Cache.Entry<?, ?> e : entries) + @Override public void writeAll(Collection<javax.cache.Cache.Entry<?, ?>> entries) { + for (javax.cache.Cache.Entry<?, ?> e : entries) storeMap.put(e.getKey(), e.getValue()); putCnt.incrementAndGet(); } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<?, ?> e) { + @Override public void write(javax.cache.Cache.Entry<?, ?> e) { storeMap.put(e.getKey(), e.getValue()); putCnt.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java index 93dac5f..9461a70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockFailoverSelfTest.java @@ -37,8 +37,8 @@ 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests group lock transaction failover. @@ -381,7 +381,7 @@ public class GridCacheGroupLockFailoverSelfTest extends GridCommonAbstractTest { Collection<Integer> ret = new ArrayList<>(keys.size()); - GridCache<Object, Object> cache = workerNode.cache(CACHE_NAME); + Cache<Object, Object> cache = workerNode.cache(CACHE_NAME); for (Integer key : keys) { if (cache.get(key) == null) // Key is absent. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java index 4fa788b..861e3bf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockPutTask.java @@ -93,7 +93,7 @@ class GridCacheGroupLockPutTask extends ComputeTaskAdapter<Collection<Integer>, @Override public Object execute() throws IgniteCheckedException { log.info("Going to put data: " + data.size()); - GridCache<Object, Object> cache = ignite.cache(cacheName); + Cache<Object, Object> cache = ignite.cache(cacheName); assert cache != null; @@ -126,7 +126,7 @@ class GridCacheGroupLockPutTask extends ComputeTaskAdapter<Collection<Integer>, * @return Grouped map. */ private Map<Integer, T2<Integer, Collection<Integer>>> groupData(Iterable<Integer> data) { - GridCache<Object, Object> cache = ignite.cache(cacheName); + Cache<Object, Object> cache = ignite.cache(cacheName); Map<Integer, T2<Integer, Collection<Integer>>> res = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java index e40822b..50689c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java @@ -35,9 +35,9 @@ import java.util.concurrent.atomic.*; 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.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.*; /** * Tests cache in-place modification logic with iterative value increment. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index 2c1cb91..32b9c66 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbstractSelfTest { /** */ @@ -404,7 +404,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst */ private void testCancelUpdate(String key, Operation op) throws Exception { // Interceptor returns null to disabled update. - GridCacheInterceptor retInterceptor = new InterceptorAdapter() { + CacheInterceptor retInterceptor = new InterceptorAdapter() { @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { return null; } @@ -486,7 +486,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst */ private void testModifyUpdate(String key, Operation op) throws Exception { // Interceptor returns incremented new value. - GridCacheInterceptor retInterceptor = new InterceptorAdapter() { + CacheInterceptor retInterceptor = new InterceptorAdapter() { @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { return (Integer)newVal + 1; } @@ -1351,7 +1351,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst private List<String> primaryKeys(int idx, int cnt) { assert cnt > 0; - GridCacheAffinity aff = cache(0).affinity(); + CacheAffinity aff = cache(0).affinity(); List<String> keys = new ArrayList<>(cnt); @@ -1376,7 +1376,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst * @return Primary key for grid. */ private String backupKey(int idx) { - GridCacheAffinity aff = cache(0).affinity(); + CacheAffinity aff = cache(0).affinity(); String key = null; @@ -1398,7 +1398,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst * @return Key which does not belong to the grid. */ private String nearKey(int idx) { - GridCacheAffinity aff = cache(0).affinity(); + CacheAffinity aff = cache(0).affinity(); String key = null; @@ -1466,7 +1466,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst /** * */ - private static class InterceptorAdapter implements GridCacheInterceptor { + private static class InterceptorAdapter implements CacheInterceptor { /** */ @Nullable @Override public Object onGet(Object key, Object val) { fail("onGet not expected"); @@ -1502,7 +1502,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst /** * */ - private class Interceptor implements GridCacheInterceptor { + private class Interceptor implements CacheInterceptor { /** */ private final Map<Object, Object> getMap = new ConcurrentHashMap8<>(); @@ -1525,7 +1525,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst private volatile boolean disabled; /** */ - private volatile GridCacheInterceptor retInterceptor; + private volatile CacheInterceptor retInterceptor; /** {@inheritDoc} */ @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java index 329a780..c09b55f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorAtomicNearEnabledSelfTest extends GridCacheInterceptorAtomicSelfTest { /** {@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/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java index db8690d..60e865f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java @@ -22,10 +22,10 @@ import org.jetbrains.annotations.*; 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 {@link org.apache.ignite.cache.GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest extends GridCacheInterceptorAbstractSelfTest { /** {@inheritDoc} */ @@ -34,7 +34,7 @@ public class GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest extends GridCac } /** {@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/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java index a05d85e..d5a0300 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java @@ -25,7 +25,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest extends GridCacheInterceptorAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java index 24c1e0a..a329109 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java @@ -25,7 +25,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorAtomicReplicatedSelfTest extends GridCacheInterceptorAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java index 5d49966..e9455ed 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java @@ -22,10 +22,10 @@ import org.jetbrains.annotations.*; 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 {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorAtomicSelfTest extends GridCacheInterceptorAbstractSelfTest { /** {@inheritDoc} */ @@ -34,7 +34,7 @@ public class GridCacheInterceptorAtomicSelfTest extends GridCacheInterceptorAbst } /** {@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/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java index 3c4aa83..88b598e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.cache.GridCacheInterceptor; - /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorAtomicWithStoreReplicatedSelfTest extends GridCacheInterceptorAtomicReplicatedSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java index 986f1b4..ca68d12 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.cache.GridCacheInterceptor; - /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorAtomicWithStoreSelfTest extends GridCacheInterceptorAtomicSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java index 5ca2a34..abf8e85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java @@ -25,7 +25,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorLocalAtomicSelfTest extends GridCacheInterceptorAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java index d2a6212..152e8e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.cache.GridCacheInterceptor; - /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorLocalAtomicWithStoreSelfTest extends GridCacheInterceptorLocalAtomicSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalSelfTest.java index baea5e3..4a7029e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalSelfTest.java @@ -23,7 +23,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorLocalSelfTest extends GridCacheInterceptorAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java index f1c1e1c..27cc308 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.cache.GridCacheInterceptor; - /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorLocalWithStoreSelfTest extends GridCacheInterceptorLocalSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java index 43102a1..33bb90c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java @@ -20,11 +20,11 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorNearEnabledSelfTest extends GridCacheInterceptorSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.NEAR_PARTITIONED; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.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/GridCacheInterceptorReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java index 9a3dd2f..f625db2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java @@ -23,7 +23,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorReplicatedSelfTest extends GridCacheInterceptorAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java index 9ae02b1..363d0c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.cache.GridCacheInterceptor; - /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorReplicatedWithStoreSelfTest extends GridCacheInterceptorReplicatedSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTest.java index 6a427b9..917aaad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTest.java @@ -20,10 +20,10 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorSelfTest extends GridCacheInterceptorAbstractSelfTest { /** {@inheritDoc} */ @@ -33,7 +33,7 @@ public class GridCacheInterceptorSelfTest extends GridCacheInterceptorAbstractSe } /** {@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/GridCacheInterceptorWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java index bcfc374..4115933 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.cache.GridCacheInterceptor; - /** - * Tests {@link GridCacheInterceptor}. + * Tests {@link org.apache.ignite.cache.CacheInterceptor}. */ public class GridCacheInterceptorWithStoreSelfTest extends GridCacheInterceptorSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java index e5e3dc6..ad61448 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIteratorPerformanceTest.java @@ -84,16 +84,16 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @param prj Projection. * @param c Visitor closure. */ - private void iterate(GridCacheProjection<Integer, Integer> prj, IgniteInClosure<GridCacheEntry<Integer, Integer>> c) { + private void iterate(CacheProjection<Integer, Integer> prj, IgniteInClosure<CacheEntry<Integer, Integer>> c) { prj.forEach(c); } /** * @return Empty filter. */ - private IgniteInClosure<GridCacheEntry<Integer, Integer>> emptyFilter() { - return new CI1<GridCacheEntry<Integer, Integer>>() { - @Override public void apply(GridCacheEntry<Integer, Integer> e) { + private IgniteInClosure<CacheEntry<Integer, Integer>> emptyFilter() { + return new CI1<CacheEntry<Integer, Integer>>() { + @Override public void apply(CacheEntry<Integer, Integer> e) { // No-op } }; @@ -103,14 +103,14 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testSmall() throws Exception { - GridCacheProjection<Integer, Integer> cache = grid().cache(null); + CacheProjection<Integer, Integer> cache = grid().cache(null); for (int i = 0; i < SMALL_ENTRY_CNT; i++) assert cache.putx(i, i); assert cache.size() == SMALL_ENTRY_CNT; - IgniteInClosure<GridCacheEntry<Integer, Integer>> c = emptyFilter(); + IgniteInClosure<CacheEntry<Integer, Integer>> c = emptyFilter(); // Warmup. for (int i = 0; i < 10; i ++) @@ -132,14 +132,14 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLarge() throws Exception { - GridCacheProjection<Integer, Integer> cache = grid().cache(null); + CacheProjection<Integer, Integer> cache = grid().cache(null); for (int i = 0; i < LARGE_ENTRY_CNT; i++) assert cache.putx(i, i); assert cache.size() == LARGE_ENTRY_CNT; - IgniteInClosure<GridCacheEntry<Integer, Integer>> c = emptyFilter(); + IgniteInClosure<CacheEntry<Integer, Integer>> c = emptyFilter(); // Warmup. for (int i = 0; i < 3; i++) @@ -161,16 +161,16 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testProjectionFiltered() throws Exception { - GridCache<Integer, Integer> cache = grid().cache(null); + Cache<Integer, Integer> cache = grid().cache(null); for (int i = 0; i < LARGE_ENTRY_CNT; i++) assert cache.putx(i, i); assert cache.size() == LARGE_ENTRY_CNT; - IgniteInClosure<GridCacheEntry<Integer, Integer>> c = emptyFilter(); + IgniteInClosure<CacheEntry<Integer, Integer>> c = emptyFilter(); - GridCacheProjection<Integer, Integer> prj = cache.projection(new P2<Integer, Integer>() { + CacheProjection<Integer, Integer> prj = cache.projection(new P2<Integer, Integer>() { @Override public boolean apply(Integer key, Integer val) { return val < SMALL_ENTRY_CNT; } @@ -199,7 +199,7 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testFiltered() throws Exception { - GridCache<Integer, Integer> cache = grid().cache(null); + Cache<Integer, Integer> cache = grid().cache(null); for (int i = 0; i < LARGE_ENTRY_CNT; i++) assert cache.putx(i, i); @@ -208,8 +208,8 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { final BoxedInt cnt = new BoxedInt(); - IgniteInClosure<GridCacheEntry<Integer, Integer>> c = new CI1<GridCacheEntry<Integer, Integer>>() { - @Override public void apply(GridCacheEntry<Integer, Integer> t) { + IgniteInClosure<CacheEntry<Integer, Integer>> c = new CI1<CacheEntry<Integer, Integer>>() { + @Override public void apply(CacheEntry<Integer, Integer> t) { if (t.peek() < SMALL_ENTRY_CNT) cnt.increment(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckNearEnabledSelfTest.java index f7b07a6..753fe98 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckNearEnabledSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.cache.*; */ public class GridCacheKeyCheckNearEnabledSelfTest extends GridCacheKeyCheckSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.NEAR_PARTITIONED; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.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/GridCacheKeyCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java index bde0189..58f2aa6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java @@ -24,9 +24,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; 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.*; /** * Tests for cache key check. @@ -44,7 +44,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -128,7 +128,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { this.atomicityMode = atomicityMode; try { - GridCache<IncorrectCacheKey, String> cache = grid(0).cache(null); + Cache<IncorrectCacheKey, String> cache = grid(0).cache(null); cache.get(new IncorrectCacheKey(0)); @@ -148,7 +148,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { this.atomicityMode = atomicityMode; try { - GridCache<IncorrectCacheKey, String> cache = grid(0).cache(null); + Cache<IncorrectCacheKey, String> cache = grid(0).cache(null); cache.put(new IncorrectCacheKey(0), "test_value"); @@ -168,7 +168,7 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { this.atomicityMode = atomicityMode; try { - GridCache<IncorrectCacheKey, String> cache = grid(0).cache(null); + Cache<IncorrectCacheKey, String> cache = grid(0).cache(null); cache.remove(new IncorrectCacheKey(0)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java index 720e778..4c52f46 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java @@ -29,9 +29,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.*; /** * Leak test. @@ -71,7 +71,7 @@ public class GridCacheLeakTest extends GridCommonAbstractTest { cfg.setName(CACHE_NAME); - cfg.setAffinity(new GridCacheRendezvousAffinityFunction(false, 128)); + cfg.setAffinity(new CacheRendezvousAffinityFunction(false, 128)); cfg.setCacheMode(PARTITIONED); cfg.setBackups(1); @@ -108,7 +108,7 @@ public class GridCacheLeakTest extends GridCommonAbstractTest { try { int i = 0; - GridCache<Object, Object> cache = grid(0).cache(CACHE_NAME); + Cache<Object, Object> cache = grid(0).cache(CACHE_NAME); while (!Thread.currentThread().isInterrupted()) { UUID key = UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index e9dec21..11d1d00 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -32,12 +32,11 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -48,7 +47,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS private static final String CACHE_NAME = "cache"; /** */ - private GridCacheDistributionMode distroMode; + private CacheDistributionMode distroMode; /** */ private boolean writeBehind; @@ -120,7 +119,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** */ - private static class TestAffinityFunction extends TestLifecycleAware implements GridCacheAffinityFunction { + private static class TestAffinityFunction extends TestLifecycleAware implements CacheAffinityFunction { /** */ TestAffinityFunction() { @@ -143,7 +142,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext affCtx) { + @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext affCtx) { List<List<ClusterNode>> res = new ArrayList<>(); res.add(nodes(0, affCtx.currentTopologySnapshot())); @@ -164,7 +163,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** */ - private static class TestEvictionPolicy extends TestLifecycleAware implements GridCacheEvictionPolicy { + private static class TestEvictionPolicy extends TestLifecycleAware implements CacheEvictionPolicy { /** */ TestEvictionPolicy() { @@ -172,14 +171,14 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, GridCacheEntry entry) { + @Override public void onEntryAccessed(boolean rmv, CacheEntry entry) { // No-op. } } /** */ - private static class TestEvictionFilter extends TestLifecycleAware implements GridCacheEvictionFilter { + private static class TestEvictionFilter extends TestLifecycleAware implements CacheEvictionFilter { /** */ TestEvictionFilter() { @@ -187,14 +186,14 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public boolean evictAllowed(GridCacheEntry entry) { + @Override public boolean evictAllowed(CacheEntry entry) { return false; } } /** */ - private static class TestCloner extends TestLifecycleAware implements GridCacheCloner { + private static class TestCloner extends TestLifecycleAware implements CacheCloner { /** */ TestCloner() { @@ -209,7 +208,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** */ - private static class TestAffinityKeyMapper extends TestLifecycleAware implements GridCacheAffinityKeyMapper { + private static class TestAffinityKeyMapper extends TestLifecycleAware implements CacheAffinityKeyMapper { /** */ TestAffinityKeyMapper() { @@ -229,7 +228,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** */ - private static class TestInterceptor extends TestLifecycleAware implements GridCacheInterceptor { + private static class TestInterceptor extends TestLifecycleAware implements CacheInterceptor { /** */ private TestInterceptor() { @@ -340,7 +339,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** {@inheritDoc} */ @SuppressWarnings("ErrorNotRethrown") @Override public void testLifecycleAware() throws Exception { - for (GridCacheDistributionMode mode : new GridCacheDistributionMode[] {PARTITIONED_ONLY, NEAR_PARTITIONED}) { + for (CacheDistributionMode mode : new CacheDistributionMode[] {PARTITIONED_ONLY, NEAR_PARTITIONED}) { distroMode = mode; writeBehind = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java index 306e3cf..3cc4602 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -102,8 +102,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex() throws Exception { final Ignite g = startGrid(0); - final GridCache<Integer, ObjectValue> cache1 = g.cache("local1"); - final GridCache<Integer, ObjectValue> cache2 = g.cache("local2"); + final Cache<Integer, ObjectValue> cache1 = g.cache("local1"); + final Cache<Integer, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -159,8 +159,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex1() throws Exception { final Ignite g = startGrid(0); - final GridCache<Integer, ObjectValue> cache1 = g.cache("local1"); - final GridCache<Integer, ObjectValue> cache2 = g.cache("local2"); + final Cache<Integer, ObjectValue> cache1 = g.cache("local1"); + final Cache<Integer, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -230,8 +230,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex2() throws Exception { final Ignite g = startGrid(0); - final GridCache<Integer, ObjectValue> cache1 = g.cache("local1"); - final GridCache<Integer, ObjectValue> cache2 = g.cache("local2"); + final Cache<Integer, ObjectValue> cache1 = g.cache("local1"); + final Cache<Integer, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -303,8 +303,8 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { public void testLuceneIndex3() throws Exception { final Ignite g = startGrid(0); - final GridCache<ObjectKey, ObjectValue> cache1 = g.cache("local1"); - final GridCache<ObjectKey, ObjectValue> cache2 = g.cache("local2"); + final Cache<ObjectKey, ObjectValue> cache1 = g.cache("local1"); + final Cache<ObjectKey, ObjectValue> cache2 = g.cache("local2"); final AtomicInteger threadIdxGen = new AtomicInteger(); @@ -376,7 +376,7 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { */ private static class ObjectValue implements Serializable { /** String value. */ - @GridCacheQueryTextField + @CacheQueryTextField private String strVal; /** @@ -422,7 +422,7 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { */ private static class ObjectKey implements Serializable { /** String key. */ - @GridCacheQueryTextField + @CacheQueryTextField private String strKey; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java index 4445fb7..bbf605f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -33,7 +33,7 @@ import org.junit.*; import java.util.*; import static java.lang.String.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Memory model self test. @@ -50,7 +50,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { private CacheMode mode; /** */ - private GridCacheMemoryMode memoryMode; + private CacheMemoryMode memoryMode; /** */ private int maxOnheapSize; @@ -83,10 +83,10 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(mode); cacheCfg.setMemoryMode(memoryMode); cacheCfg.setEvictionPolicy(maxOnheapSize == Integer.MAX_VALUE ? null : - new GridCacheLruEvictionPolicy(maxOnheapSize)); + new CacheLruEvictionPolicy(maxOnheapSize)); cacheCfg.setAtomicityMode(atomicity); cacheCfg.setOffHeapMaxMemory(offheapSize); - cacheCfg.setQueryIndexEnabled(memoryMode != GridCacheMemoryMode.OFFHEAP_VALUES); + cacheCfg.setQueryIndexEnabled(memoryMode != CacheMemoryMode.OFFHEAP_VALUES); cacheCfg.setPortableEnabled(portableEnabled()); cfg.setCacheConfiguration(cacheCfg); @@ -107,7 +107,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { */ public void testOnheap() throws Exception { mode = CacheMode.LOCAL; - memoryMode = GridCacheMemoryMode.ONHEAP_TIERED; + memoryMode = CacheMemoryMode.ONHEAP_TIERED; maxOnheapSize = Integer.MAX_VALUE; swapEnabled = false; atomicity = CacheAtomicityMode.ATOMIC; @@ -121,7 +121,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { */ public void testOnheapSwap() throws Exception { mode = CacheMode.LOCAL; - memoryMode = GridCacheMemoryMode.ONHEAP_TIERED; + memoryMode = CacheMemoryMode.ONHEAP_TIERED; maxOnheapSize = 330; swapEnabled = true; atomicity = CacheAtomicityMode.ATOMIC; @@ -135,7 +135,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { */ public void testOffheap() throws Exception { mode = CacheMode.LOCAL; - memoryMode = GridCacheMemoryMode.OFFHEAP_TIERED; + memoryMode = CacheMemoryMode.OFFHEAP_TIERED; maxOnheapSize = Integer.MAX_VALUE; swapEnabled = false; atomicity = CacheAtomicityMode.ATOMIC; @@ -149,7 +149,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { */ public void testOffheapSwap() throws Exception { mode = CacheMode.LOCAL; - memoryMode = GridCacheMemoryMode.OFFHEAP_TIERED; + memoryMode = CacheMemoryMode.OFFHEAP_TIERED; maxOnheapSize = Integer.MAX_VALUE; swapEnabled = true; atomicity = CacheAtomicityMode.ATOMIC; @@ -163,7 +163,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { */ public void testTiered() throws Exception { mode = CacheMode.LOCAL; - memoryMode = GridCacheMemoryMode.ONHEAP_TIERED; + memoryMode = CacheMemoryMode.ONHEAP_TIERED; maxOnheapSize = 24; swapEnabled = true; atomicity = CacheAtomicityMode.ATOMIC; @@ -177,7 +177,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { */ public void testOffheapValuesConfigFixBackward() throws Exception { mode = CacheMode.LOCAL; - memoryMode = GridCacheMemoryMode.OFFHEAP_VALUES; + memoryMode = CacheMemoryMode.OFFHEAP_VALUES; maxOnheapSize = 24; swapEnabled = true; atomicity = CacheAtomicityMode.ATOMIC; @@ -209,16 +209,16 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { final int all = cache + offheapSwap; // put - doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<GridCache<String, Integer>>() { - @Override public void applyx(GridCache<String, Integer> c) throws IgniteCheckedException { + doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<Cache<String, Integer>>() { + @Override public void applyx(Cache<String, Integer> c) throws IgniteCheckedException { for (int i = 0; i < all; i++) c.put(valueOf(i), i); } }); //putAll - doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<GridCache<String, Integer>>() { - @Override public void applyx(GridCache<String, Integer> c) throws IgniteCheckedException { + doTest(cache, offheapSwap, offheapEmpty, swapEmpty, new CIX1<Cache<String, Integer>>() { + @Override public void applyx(Cache<String, Integer> c) throws IgniteCheckedException { Map<String, Integer> m = new HashMap<>(); for (int i = 0; i < all; i++) @@ -237,12 +237,12 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { * @param x Cache modifier. * @throws IgniteCheckedException If failed. */ - void doTest(int cache, int offheapSwap, boolean offheapEmpty, boolean swapEmpty, CIX1<GridCache<String, Integer>> x) throws Exception { + void doTest(int cache, int offheapSwap, boolean offheapEmpty, boolean swapEmpty, CIX1<Cache<String, Integer>> x) throws Exception { ipFinder = new TcpDiscoveryVmIpFinder(true); startGrid(); - final GridCache<String, Integer> c = cache(); + final Cache<String, Integer> c = cache(); x.applyx(c); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java index 68f0638..61b6154 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java @@ -83,7 +83,7 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testMissingCommitVersion() throws Exception { - final GridCache<Integer, Integer> cache = cache(); + final Cache<Integer, Integer> cache = cache(); final int KEYS_PER_THREAD = 10_000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java index 4e3e805..23e9ef0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java @@ -30,7 +30,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -91,7 +91,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT int key = rnd.nextInt(keys); - GridCache<Integer, Integer> prj = grid(g).cache(null); + Cache<Integer, Integer> prj = grid(g).cache(null); try (IgniteTx tx = prj.txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer val = prj.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index 35ff9cc..e0be3be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -35,11 +35,11 @@ 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.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests multi-update locks. @@ -131,7 +131,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { started.set(true); - GridCache<Object, Object> c = g4.cache(null); + Cache<Object, Object> c = g4.cache(null); info(">>>> Checking tx in new grid."); @@ -152,7 +152,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { assertFalse(started.get()); // Check we can proceed with transactions. - GridCache<Object, Object> cache0 = g.cache(null); + Cache<Object, Object> cache0 = g.cache(null); info(">>>> Checking tx commit."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.java index 6dd3fdb..ec424d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCacheMultinodeUpdateAtomicNearEnabledSelfTest extends GridCacheMultinodeUpdateAbstractSelfTest { /** {@inheritDoc} */ @SuppressWarnings("RedundantMethodOverride") - @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/GridCacheMultinodeUpdateAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicSelfTest.java index a06dddf..c032c3f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateAtomicSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * */ public class GridCacheMultinodeUpdateAtomicSelfTest extends GridCacheMultinodeUpdateAbstractSelfTest { /** {@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/GridCacheMultinodeUpdateNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java index bbb8a84..5a0a06b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; public class GridCacheMultinodeUpdateNearEnabledSelfTest extends GridCacheMultinodeUpdateAbstractSelfTest { /** {@inheritDoc} */ @SuppressWarnings("RedundantMethodOverride") - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; }
