http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java index 470030a..14247b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Test for cache swap preloading. @@ -61,7 +61,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { CacheConfiguration cacheCfg = defaultCacheConfiguration(); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(true); cacheCfg.setCacheMode(cacheMode); cacheCfg.setPreloadMode(SYNC); @@ -96,7 +96,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { try { startGrid(0); - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); // Populate. for (int i = 0; i < ENTRY_CNT; i++) @@ -154,7 +154,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { try { startGrid(0); - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).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/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java index 1cccdc0..902b45e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.*; @@ -40,7 +39,7 @@ import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test that swap is released after entry is reloaded. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index a61c24c..cffcf6e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.dr.*; @@ -116,7 +115,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** {@inheritDoc} */ - @Nullable @Override public GridCacheEntry<K, V> evictWrap() { + @Nullable @Override public CacheEntry<K, V> evictWrap() { return null; } @@ -337,12 +336,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public GridCacheEntry<K, V> wrap(boolean prjAware) { + @Override public CacheEntry<K, V> wrap(boolean prjAware) { assert false; return null; } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { + @Override public CacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { assert false; return null; } @@ -368,20 +367,20 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public boolean invalidate(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public boolean invalidate(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { assert false; return false; } /** @inheritDoc */ - @Override public boolean compact(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public boolean compact(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { assert false; return false; } /** @inheritDoc */ @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { assert false; return false; } @@ -413,20 +412,20 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme UUID subjId, Object transformClo, String taskName, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiryPlc) { return val; } /** @inheritDoc */ - @Override public V innerReload(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public V innerReload(IgnitePredicate<CacheEntry<K, V>>[] filter) { return val; } /** @inheritDoc */ @Override public GridCacheUpdateTxResult<V> innerSet(@Nullable IgniteTxEx<K, V> tx, UUID evtNodeId, UUID affNodeId, @Nullable V val, @Nullable byte[] valBytes, boolean writeThrough, boolean retval, long ttl, - boolean evt, boolean metrics, long topVer, IgnitePredicate<GridCacheEntry<K, V>>[] filter, GridDrType drType, + boolean evt, boolean metrics, long topVer, IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) throws IgniteCheckedException, GridCacheEntryRemovedException { return new GridCacheUpdateTxResult<>(true, rawPut(val, ttl)); @@ -442,7 +441,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, boolean intercept, UUID subjId, String taskName) @@ -466,7 +465,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme boolean metrics, boolean primary, boolean checkVer, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, long drTtl, long drExpireTime, @@ -490,7 +489,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme /** @inheritDoc */ @Override public GridCacheUpdateTxResult<V> innerRemove(@Nullable IgniteTxEx<K, V> tx, UUID evtNodeId, UUID affNodeId, boolean writeThrough, boolean retval, boolean evt, boolean metrics, long topVer, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId, + IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) throws IgniteCheckedException, GridCacheEntryRemovedException { obsoleteVer = ver; @@ -504,7 +503,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme /** @inheritDoc */ @Override public boolean clear(GridCacheVersion ver, boolean readers, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { if (ver == null || ver.equals(this.ver)) { val = null; @@ -586,26 +585,26 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public V peek(GridCachePeekMode mode, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public V peek(GridCachePeekMode mode, IgnitePredicate<CacheEntry<K, V>>[] filter) { return val; } /** @inheritDoc */ @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) + IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException { return F.t(val); } /** @inheritDoc */ - @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException { return val; } /** @inheritDoc */ @Override public V peekFailFast(GridCachePeekMode mode, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { assert false; return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java index 870ffcd..c782155 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java @@ -26,7 +26,7 @@ import java.io.*; */ public class GridCacheTestValue implements Serializable, Cloneable { /** */ - @GridCacheQuerySqlField(unique = true) + @CacheQuerySqlField(unique = true) private String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java index 3b26aba..e5bc01f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java @@ -26,7 +26,7 @@ import java.io.*; */ public class GridCacheTestValue2 implements Serializable { /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index 5a84427..1d6d3b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -206,7 +206,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid */ private void testCommits(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { IgniteTx tx = cache.txStart(concurrency, isolation); @@ -220,7 +220,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int i = 0; i < gridCount(); i++) { IgniteTxMetrics metrics = grid(i).transactions().metrics(); - GridCacheMetrics cacheMetrics = grid(i).cache(null).metrics(); + CacheMetrics cacheMetrics = grid(i).cache(null).metrics(); if (i == 0) { assertEquals(TX_CNT, metrics.txCommits()); @@ -246,7 +246,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid */ private void testRollbacks(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < TX_CNT; i++) { IgniteTx tx = cache.txStart(concurrency, isolation); @@ -260,7 +260,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int i = 0; i < gridCount(); i++) { IgniteTxMetrics metrics = grid(i).transactions().metrics(); - GridCacheMetrics cacheMetrics = grid(i).cache(null).metrics(); + CacheMetrics cacheMetrics = grid(i).cache(null).metrics(); assertEquals(0, metrics.txCommits()); assertEquals(0, cacheMetrics.txCommits()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java index c2759d8..8580334 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java @@ -24,17 +24,17 @@ 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.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * */ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTest { /** Memory mode. */ - private GridCacheMemoryMode memMode; + private CacheMemoryMode memMode; @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -60,7 +60,7 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setMemoryMode(memMode); ccfg.setOffHeapMaxMemory(1024 * 1024 * 1024); - ccfg.setPreloadMode(GridCachePreloadMode.SYNC); + ccfg.setPreloadMode(CachePreloadMode.SYNC); return ccfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java index 9f5f0b2..a97a7a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java @@ -28,9 +28,9 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; 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.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.*; /** * @@ -87,7 +87,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach /** * @return Distribution mode. */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -109,7 +109,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach public void testPutRemove() throws Exception { awaitPartitionMapExchange(); - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); int keyCnt = 10; @@ -117,7 +117,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach cache.put("key" + i, i); for (int g = 0; g < gridCount(); g++) { - GridCache<String, Integer> cache0 = cache(g); + Cache<String, Integer> cache0 = cache(g); ClusterNode locNode = grid(g).localNode(); for (int i = 0; i < keyCnt; i++) { @@ -148,7 +148,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach assertEquals((Integer)i, cache.remove("key" + i)); for (int g = 0; g < gridCount(); g++) { - GridCache<String, Integer> cache0 = cache(g); + Cache<String, Integer> cache0 = cache(g); for (int i = 0; i < keyCnt; i++) { String key = "key" + i; @@ -166,7 +166,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach public void testPutRemoveAll() throws Exception { awaitPartitionMapExchange(); - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); int keyCnt = 10; @@ -177,7 +177,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach } for (int g = 0; g < gridCount(); g++) { - GridCache<String, Integer> cache0 = cache(g); + Cache<String, Integer> cache0 = cache(g); ClusterNode locNode = grid(g).localNode(); for (int i = 0; i < keyCnt; i++) { @@ -211,7 +211,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach info(">>>> Starting values check"); for (int g = 0; g < gridCount(); g++) { - GridCache<String, Integer> cache0 = cache(g); + Cache<String, Integer> cache0 = cache(g); for (int i = 0; i < keyCnt; i++) { String key = "key" + i; @@ -246,7 +246,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach Ignite ignite = grid(g); - GridCache<Object, Object> cache = ignite.cache(null); + Cache<Object, Object> cache = ignite.cache(null); int k = rnd.nextInt(range); @@ -299,7 +299,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach * @param g Grid to check. */ private void checkKeySet(Ignite g) { - GridCache<Object, Object> cache = g.cache(null); + Cache<Object, Object> cache = g.cache(null); Set<Object> keys = cache.keySet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalNearEnabledSelfTest.java index d28b573..09f1975 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalNearEnabledSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.cache.*; public class GridCacheValueConsistencyTransactionalNearEnabledSelfTest extends GridCacheValueConsistencyTransactionalSelfTest { /** {@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/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 6165db0..69b93f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -65,7 +65,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(1); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cfg.setCacheConfiguration(cacheCfg); @@ -123,7 +123,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { @SuppressWarnings({"BusyWait"}) @Override public void applyx() throws IgniteCheckedException { while (cnt++ < txCnt && !done.get()) { - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); if (cnt % logMod == 0) info("Starting transaction: " + cnt); @@ -164,7 +164,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { GridFuture<?> debugFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { @SuppressWarnings({"UnusedDeclaration"}) @Override public void run() { - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); try { Thread.sleep(15000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index cb7884d..23def1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -34,7 +34,7 @@ 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.CacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -62,7 +62,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - GridCache<?, ?> cache = cache(); + Cache<?, ?> cache = cache(); if (cache != null) cache.clearAll(); @@ -87,7 +87,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(cacheMode()); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setSwapEnabled(false); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); @@ -107,7 +107,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb /** @throws Exception If test fails. */ public void testWriteThrough() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); Map<Integer, String> map = store.getMap(); @@ -172,7 +172,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb /** @throws Exception If test failed. */ public void testReadThrough() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); Map<Integer, String> map = store.getMap(); @@ -268,7 +268,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb final AtomicBoolean running = new AtomicBoolean(true); - final GridCache<Integer, String> cache = cache(); + final Cache<Integer, String> cache = cache(); IgniteFuture<?> fut = multithreadedAsync(new Runnable() { @SuppressWarnings({"NullableProblems"}) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index 1dc4178..f66331c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -32,7 +32,7 @@ import javax.cache.configuration.*; 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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -138,7 +138,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private void checkSingleWrites() throws Exception { prepare(); - GridCache<Integer, String> cache = grid(0).cache(null); + Cache<Integer, String> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) cache.put(i, String.valueOf(i)); @@ -168,7 +168,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private void checkTxWrites() throws Exception { prepare(); - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { for (int i = 0; i < 100; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 3fe43ca..019829d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -29,14 +29,13 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; -import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Abstract class for cache tests. @@ -189,12 +188,12 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { /** * @return Partitioned mode. */ - protected abstract GridCacheDistributionMode distributionMode(); + protected abstract CacheDistributionMode distributionMode(); /** * @return Write synchronization. */ - protected GridCacheWriteSynchronizationMode writeSynchronization() { + protected CacheWriteSynchronizationMode writeSynchronization() { return FULL_SYNC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java index 1814946..90cd3f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -49,7 +49,7 @@ public class IgniteCacheAtomicInvokeTest extends IgniteCacheInvokeAbstractTest { } /** {@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/IgniteCacheAtomicLocalInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalInvokeTest.java index 1fc6909..4faa8b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalInvokeTest.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.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheAtomicLocalInvokeTest extends IgniteCacheInvokeAbstractT } /** {@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/IgniteCacheAtomicNearEnabledInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledInvokeTest.java index ac290d1..3a23e49 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicNearEnabledInvokeTest.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.*; /** * */ public class IgniteCacheAtomicNearEnabledInvokeTest extends IgniteCacheAtomicInvokeTest { /** {@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/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java index 99ab8a1..f0b6801 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -49,7 +49,7 @@ public class IgniteCacheAtomicPrimaryWriteOrderInvokeTest extends IgniteCacheInv } /** {@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/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index 29c7781..fa307f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -822,7 +822,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb * @throws Exception If failed. */ protected Collection<Integer> keys() throws Exception { - GridCache<Integer, Object> cache = cache(0); + Cache<Integer, Object> cache = cache(0); ArrayList<Integer> keys = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicLocalTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicLocalTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicLocalTest.java index b84027c..012192d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicLocalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicLocalTest.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.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheEntryListenerAtomicLocalTest extends IgniteCacheEntryLis } /** {@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/IgniteCacheEntryListenerAtomicTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java index 7882377..baef988 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -49,7 +49,7 @@ public class IgniteCacheEntryListenerAtomicTest extends IgniteCacheEntryListener } /** {@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/IgniteCacheEntryListenerTxLocalTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.java index a1cc1fe..9f7dcc0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.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.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheEntryListenerTxLocalTest extends IgniteCacheEntryListene } /** {@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/IgniteCacheEntryListenerTxTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java index 109db9e..18d4500 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.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.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheEntryListenerTxTest extends IgniteCacheEntryListenerAbst } /** {@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/IgniteCacheInvokeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java index 934e8aa..708dc82 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java @@ -33,7 +33,7 @@ import java.util.concurrent.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -487,7 +487,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT * @throws Exception If failed. */ protected Collection<Integer> keys() throws Exception { - GridCache<Integer, Object> cache = cache(0); + Cache<Integer, Object> cache = cache(0); ArrayList<Integer> keys = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java index 73e2a3d..db9d75a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.cache.store.*; import javax.cache.processor.*; 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.*; /** @@ -50,7 +50,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheAbstractTest { } /** {@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/IgniteCacheTxInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxInvokeTest.java index 2a5ab65..39b25b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxInvokeTest.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.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxInvokeTest extends IgniteCacheInvokeAbstractTest { } /** {@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/IgniteCacheTxLocalInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalInvokeTest.java index b5c5200..d32029f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxLocalInvokeTest.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.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxLocalInvokeTest extends IgniteCacheInvokeAbstractTest } /** {@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/IgniteCacheTxNearEnabledInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledInvokeTest.java index a422d3b..0a34f1e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxNearEnabledInvokeTest.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.*; /** * */ public class IgniteCacheTxNearEnabledInvokeTest extends IgniteCacheTxInvokeTest { /** {@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/IgniteCachingProviderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java index 99aa3e1..c88bd01 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java @@ -46,8 +46,8 @@ public class IgniteCachingProviderSelfTest extends IgniteCacheAbstractTest { } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.PARTITIONED_ONLY; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.PARTITIONED_ONLY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java index b0286b6..4fe7e86 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java @@ -127,7 +127,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @return Cache. */ @SuppressWarnings("unchecked") - @Override protected GridCache<Integer, String> cache(int i) { + @Override protected Cache<Integer, String> cache(int i) { return grid(i).cache(null); } @@ -173,7 +173,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { debug("Checking commit on grid: " + ignite.cluster().localNode().id()); for (int i = 0; i < iterations(); i++) { - GridCache<Integer, String> cache = cache(gridIdx); + Cache<Integer, String> cache = cache(gridIdx); IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0); @@ -185,7 +185,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { assert key >= prevKey : "key: " + key + ", prevKey: " + prevKey; if (isTestDebug()) { - GridCacheAffinityFunction aff = cache.configuration().getAffinity(); + CacheAffinityFunction aff = cache.configuration().getAffinity(); int part = aff.partition(key); @@ -310,14 +310,14 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { debug("Checking commit on grid: " + ignite.cluster().localNode().id()); for (int i = 0; i < iterations(); i++) { - GridCache<Integer, String> cache = cache(gridIdx); + Cache<Integer, String> cache = cache(gridIdx); IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0); try { for (Integer key : getKeys()) { if (isTestDebug()) { - GridCacheAffinityFunction aff = cache.configuration().getAffinity(); + CacheAffinityFunction aff = cache.configuration().getAffinity(); int part = aff.partition(key); @@ -408,12 +408,12 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { for (int i = 1; i <= maxKeyValue(); i++) { for (int k = 0; k < 3; k++) { try { - GridCacheEntry<Integer, String> e1 = null; + CacheEntry<Integer, String> e1 = null; String v1 = null; for (int j = 0; j < gridCount(); j++) { - GridCache<Integer, String> cache = cache(j); + Cache<Integer, String> cache = cache(j); IgniteTx tx = cache.tx(); @@ -425,7 +425,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { v1 = e1.get(); } else { - GridCacheEntry<Integer, String> e2 = cache.entry(i); + CacheEntry<Integer, String> e2 = cache.entry(i); String v2 = e2.get(); @@ -456,7 +456,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { for (int k = 0; k < 3; k++) { try { for (int j = 0; j < gridCount(); j++) { - GridCacheProjection<Integer, String> cache = cache(j); + CacheProjection<Integer, String> cache = cache(j); cache.removeAll(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 58b7452..2c7ed2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -282,7 +283,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); if (putBefore) { idxSpi.forceFail(false); @@ -537,7 +538,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @return Key. */ private Integer keyForNode(ClusterNode node, int type) { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); if (cache.configuration().getCacheMode() == LOCAL) return ++lastKey; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 8674d4b..36ecc31 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -109,7 +109,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private static UUID primaryId(Ignite ignite, Object key) { - GridCacheAffinity aff = ignite.cache(null).cache().affinity(); + CacheAffinity aff = ignite.cache(null).cache().affinity(); Collection<ClusterNode> affNodes = aff.mapPartitionToPrimaryAndBackups(aff.partition(key)); @@ -157,7 +157,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onItemNear(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteCheckedException { - GridCache<String, Integer> cache = ignite.cache(null); + Cache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID itemPrimaryId = primaryId(ignite, itemKey); @@ -209,7 +209,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onItemPrimary(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteCheckedException { - GridCache<String, Integer> cache = ignite.cache(null); + Cache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID itemPrimaryId = primaryId(ignite, itemKey); @@ -262,7 +262,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onRemoveItemQueried(boolean putCntr, Ignite ignite, int retry) throws IgniteCheckedException { - GridCache<String, Integer> cache = ignite.cache(null); + Cache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY); @@ -294,7 +294,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe } while (true) { - GridCacheQuery<Map.Entry<String, Integer>> qry = + CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_key != 'RMVD_CNTR_KEY' and _val >= 0"); if (DEBUG) @@ -352,7 +352,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe */ @SuppressWarnings("unchecked") private void onRemoveItemSimple(boolean putCntr, Ignite ignite, int retry) throws IgniteCheckedException { - GridCache<String, Integer> cache = ignite.cache(null); + Cache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); UUID cntrPrimaryId = primaryId(ignite, RMVD_CNTR_KEY); @@ -629,7 +629,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - GridCache<String, Integer> cache = grid(0).cache(null); + Cache<String, Integer> cache = grid(0).cache(null); cache.put(RMVD_CNTR_KEY, 0); @@ -640,7 +640,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe for (int j = 0; j < GRID_CNT; j++) assertEquals(i, grid(j).cache(null).get(String.valueOf(i))); - GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, " _val >= 0"); + CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, " _val >= 0"); Collection<Map.Entry<String, Integer>> entries = qry.execute().get(); @@ -670,7 +670,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe startGrids(GRID_CNT); try { - GridCache<String, Integer> cache = grid(0).cache(null); + Cache<String, Integer> cache = grid(0).cache(null); cache.put(RMVD_CNTR_KEY, 0); @@ -681,7 +681,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe for (int j = 0; j < GRID_CNT; j++) assertEquals(i, grid(j).cache(null).get(Integer.toString(i))); - GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, " _val >= 0"); + CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, " _val >= 0"); Collection<Map.Entry<String, Integer>> entries = qry.execute().get(); @@ -721,7 +721,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe try { startGrids(GRID_CNT); - GridCache<String, Integer> cache = grid(0).cache(null); + Cache<String, Integer> cache = grid(0).cache(null); // Store counter. cache.put(RMVD_CNTR_KEY, 0); @@ -737,7 +737,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe for (int j = 0; j < GRID_CNT; j++) assertEquals(i, grid(j).cache(null).get(String.valueOf(i))); - GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0"); + CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0"); // Load all results. qry.keepAll(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index af541c7..c723c9b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -208,7 +208,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract */ // TODO: GG-8063, enabled when fixed. public void _testOptimisticSerializableConsistency() throws Exception { - final GridCache<Integer, Long> cache = grid(0).cache(null); + final Cache<Integer, Long> cache = grid(0).cache(null); final int THREADS = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java index 83a085e..a498cb9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java @@ -36,7 +36,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -82,7 +82,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(cacheMode()); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(nearEnabled() ? NEAR_PARTITIONED : PARTITIONED_ONLY); @@ -96,7 +96,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract startGrids(gridCount()); try { - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); // Find test key. int key = testKey(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index feb2ce4..c532cb5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.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.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -285,7 +286,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); if (putBefore) { store.forceFail(false); @@ -546,7 +547,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @return Key. */ private Integer keyForNode(ClusterNode node, int type) { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); if (cache.configuration().getCacheMode() == LOCAL) return ++lastKey; @@ -625,13 +626,13 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<?, ?> entry) { + @Override public void write(javax.cache.Cache.Entry<?, ?> entry) { if (fail) throw new CacheWriterException("Store exception"); } /** {@inheritDoc} */ - @Override public void writeAll(Collection<Cache.Entry<?, ?>> entries) { + @Override public void writeAll(Collection<javax.cache.Cache.Entry<?, ?>> entries) { if (fail) throw new CacheWriterException("Store exception"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java index bb490f3..ab2d4bf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java @@ -31,7 +31,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Failover tests for cache data structures. @@ -120,7 +120,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicLongConstantTopologyChange() throws Exception { try { - GridCacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true); + CacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { @@ -170,7 +170,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicLongConstantMultipleTopologyChange() throws Exception { try { - GridCacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true); + CacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { @@ -249,7 +249,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicReferenceConstantTopologyChange() throws Exception { try { - GridCacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true); + CacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { @@ -298,7 +298,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicReferenceConstantMultipleTopologyChange() throws Exception { try { - GridCacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true); + CacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { @@ -384,7 +384,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicStampedConstantTopologyChange() throws Exception { try { - GridCacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true); + CacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { @@ -447,7 +447,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicStampedConstantMultipleTopologyChange() throws Exception { try { - GridCacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true); + CacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { @@ -541,7 +541,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testCountDownLatchConstantTopologyChange() throws Exception { try { - GridCacheCountDownLatch s = cache().dataStructures().countDownLatch(STRUCTURE_NAME, Integer.MAX_VALUE, + CacheCountDownLatch s = cache().dataStructures().countDownLatch(STRUCTURE_NAME, Integer.MAX_VALUE, false, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @@ -596,7 +596,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testCountDownLatchConstantMultipleTopologyChange() throws Exception { try { - GridCacheCountDownLatch s = cache().dataStructures() + CacheCountDownLatch s = cache().dataStructures() .countDownLatch(STRUCTURE_NAME, Integer.MAX_VALUE, false, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @@ -680,7 +680,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testFifoQueueConstantTopologyChange() throws Exception { try { - GridCacheQueue<Integer> s = cache().dataStructures().queue(STRUCTURE_NAME, 0, false, true); + CacheQueue<Integer> s = cache().dataStructures().queue(STRUCTURE_NAME, 0, false, true); s.put(1); @@ -730,7 +730,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testFifoQueueConstantMultipleTopologyChange() throws Exception { try { - GridCacheQueue<Integer> s = cache().dataStructures().queue(STRUCTURE_NAME, 0, false, true); + CacheQueue<Integer> s = cache().dataStructures().queue(STRUCTURE_NAME, 0, false, true); s.put(1); @@ -807,7 +807,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicSequenceConstantTopologyChange() throws Exception { try { - GridCacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true); + CacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { @@ -888,7 +888,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr private Ignite g; @Override public Object call() throws Exception { - GridCacheAtomicSequence seq = g.cache(null).dataStructures().atomicSequence(STRUCTURE_NAME, 1, + CacheAtomicSequence seq = g.cache(null).dataStructures().atomicSequence(STRUCTURE_NAME, 1, true); assert seq != null; @@ -909,7 +909,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr */ public void testAtomicSequenceConstantMultipleTopologyChange() throws Exception { try { - GridCacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true); + CacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true); IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java index 3f62b8e..95db99e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java @@ -34,7 +34,7 @@ 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.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -107,7 +107,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -130,7 +130,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte * @throws Exception If failed. */ private void testAddFailover(boolean collocated) throws Exception { - GridCacheQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME, 0, collocated, true); + CacheQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME, 0, collocated, true); assertNotNull(queue); assertEquals(0, queue.size()); @@ -168,7 +168,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte * @param killIdxs Indexes of nodes to kill. * @throws Exception If failed. */ - private void testAddFailover(GridCacheQueue<Integer> queue, final List<Integer> killIdxs) throws Exception { + private void testAddFailover(CacheQueue<Integer> queue, final List<Integer> killIdxs) throws Exception { assert !killIdxs.isEmpty(); final AtomicBoolean stop = new AtomicBoolean(); @@ -223,7 +223,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte * @throws Exception If failed. */ private void testPollFailover(boolean collocated) throws Exception { - GridCacheQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME, 0, collocated, true); + CacheQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME, 0, collocated, true); assertNotNull(queue); assertEquals(0, queue.size()); @@ -261,7 +261,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte * @param killIdxs Indexes of nodes to kill. * @throws Exception If failed. */ - private void testPollFailover(GridCacheQueue<Integer> queue, final List<Integer> killIdxs) throws Exception { + private void testPollFailover(CacheQueue<Integer> queue, final List<Integer> killIdxs) throws Exception { assert !killIdxs.isEmpty(); final int ITEMS = atomicityMode() == ATOMIC && !queue.collocated() ? 10_000 : 3000; @@ -363,7 +363,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte * @return Primary node for queue's header. */ private int primaryQueueNode() { - GridCacheAffinity<Object> aff = grid(0).cache(null).affinity(); + CacheAffinity<Object> aff = grid(0).cache(null).affinity(); for (int i = 0; i < gridCount(); i++) { for (GridCacheEntryEx e : ((GridKernal)grid(i)).context().cache().internalCache().map().allEntries0()) {
