http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateSelfTest.java index 7d60f25..42283ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateSelfTest.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 GridCacheMultinodeUpdateSelfTest 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/GridCacheMvccManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java index f7fb614..2a28d4b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java @@ -60,7 +60,7 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(mode); - cfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cfg.setAtomicityMode(TRANSACTIONAL); return cfg; @@ -95,7 +95,7 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGridsMultiThreaded(gridCnt); - GridCache<Integer, Integer> cache = ignite.cache(null); + Cache<Integer, Integer> cache = ignite.cache(null); IgniteTx tx = cache.txStart(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java index 473be26..e0bc3e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java @@ -29,7 +29,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Test cases for multi-threaded tests in partitioned cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java index ecb3cda..444da3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -106,7 +105,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTwoTx() throws Exception { - final GridCache<String, Integer> c = grid(0).cache(null); + final Cache<String, Integer> c = grid(0).cache(null); GridKernalContext ctx = ((GridKernal)grid(0)).context(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java index f644a9a..9fccc8f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -34,7 +34,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -49,7 +49,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { private CacheMode cacheMode; /** Cache eviction policy. */ - private GridCacheEvictionPolicy evictionPlc; + private CacheEvictionPolicy evictionPlc; /** Near enabled flag. */ private boolean nearEnabled; @@ -84,7 +84,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testLocalCacheFifoEvictionPolicy() throws Exception { cacheMode = LOCAL; - evictionPlc = new GridCacheFifoEvictionPolicy(); + evictionPlc = new CacheFifoEvictionPolicy(); checkToString(); } @@ -92,7 +92,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testLocalCacheLruEvictionPolicy() throws Exception { cacheMode = LOCAL; - evictionPlc = new GridCacheLruEvictionPolicy(); + evictionPlc = new CacheLruEvictionPolicy(); checkToString(); } @@ -100,7 +100,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testReplicatedCacheFifoEvictionPolicy() throws Exception { cacheMode = REPLICATED; - evictionPlc = new GridCacheFifoEvictionPolicy(); + evictionPlc = new CacheFifoEvictionPolicy(); checkToString(); } @@ -108,7 +108,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testReplicatedCacheLruEvictionPolicy() throws Exception { cacheMode = REPLICATED; - evictionPlc = new GridCacheLruEvictionPolicy(); + evictionPlc = new CacheLruEvictionPolicy(); checkToString(); } @@ -117,7 +117,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { public void testPartitionedCacheFifoEvictionPolicy() throws Exception { cacheMode = PARTITIONED; nearEnabled = true; - evictionPlc = new GridCacheFifoEvictionPolicy(); + evictionPlc = new CacheFifoEvictionPolicy(); checkToString(); } @@ -126,7 +126,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { public void testPartitionedCacheLruEvictionPolicy() throws Exception { cacheMode = PARTITIONED; nearEnabled = true; - evictionPlc = new GridCacheLruEvictionPolicy(); + evictionPlc = new CacheLruEvictionPolicy(); checkToString(); } @@ -135,7 +135,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { public void testColocatedCacheFifoEvictionPolicy() throws Exception { cacheMode = PARTITIONED; nearEnabled = false; - evictionPlc = new GridCacheFifoEvictionPolicy(); + evictionPlc = new CacheFifoEvictionPolicy(); checkToString(); } @@ -144,7 +144,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { public void testColocatedCacheLruEvictionPolicy() throws Exception { cacheMode = PARTITIONED; nearEnabled = false; - evictionPlc = new GridCacheLruEvictionPolicy(); + evictionPlc = new CacheLruEvictionPolicy(); checkToString(); } @@ -154,7 +154,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(0); try { - GridCache<Object, Object> cache = g.cache(null); + Cache<Object, Object> cache = g.cache(null); for (int i = 0; i < 10; i++) cache.put(i, i); @@ -166,7 +166,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { assertFalse("Entry is locked after implicit transaction commit: " + entry, entry.lockedByAny()); } - Set<GridCacheEntry<Object, Object>> entries = cache.entrySet(); + Set<CacheEntry<Object, Object>> entries = cache.entrySet(); assertNotNull(entries); assertFalse(entries.toString().isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java index e6c5c8c..03c77b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java @@ -28,9 +28,9 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +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.*; /** * Multithreaded update test with off heap enabled. @@ -131,7 +131,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPut(final Integer key) throws Exception { - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -177,7 +177,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutxIfAbsent(final Integer key) throws Exception { - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -221,7 +221,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutWithFilter(final Integer key) throws Exception { - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -265,7 +265,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend * @throws Exception If failed. */ private void testPutGet(final Integer key) throws Exception { - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -327,7 +327,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend protected Integer keyForNode(int idx) { Integer key0 = null; - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 10_000; i++) { if (cache.affinity().isPrimary(grid(idx).localNode(), i)) { @@ -374,9 +374,9 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend /** * */ - protected static class TestFilter implements IgnitePredicate<GridCacheEntry<Integer, Integer>> { + protected static class TestFilter implements IgnitePredicate<CacheEntry<Integer, Integer>> { /** {@inheritDoc} */ - @Override public boolean apply(GridCacheEntry<Integer, Integer> e) { + @Override public boolean apply(CacheEntry<Integer, Integer> e) { if (e == null) { failed = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java index 718a406..212afb3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java @@ -123,7 +123,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -179,7 +179,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutWithFilterTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -235,7 +235,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @throws Exception If failed. */ private void testPutxIfAbsentTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { - final GridCache<Integer, Integer> cache = grid(0).cache(null); + final Cache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index ca43e78..83f62fd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -40,7 +40,7 @@ import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -109,8 +109,8 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); - GridCache<Integer, Object> cache1 = ignite1.cache(null); - GridCache<Integer, Object> cache2 = ignite2.cache(null); + Cache<Integer, Object> cache1 = ignite1.cache(null); + Cache<Integer, Object> cache2 = ignite2.cache(null); Object v1 = new CacheValue(1); @@ -180,7 +180,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @throws InterruptedException If thread was interrupted. */ @SuppressWarnings({"BusyWait"}) - private boolean waitCacheEmpty(GridCacheProjection<Integer,Object> cache, long timeout) + private boolean waitCacheEmpty(CacheProjection<Integer,Object> cache, long timeout) throws InterruptedException { assert cache != null; assert timeout >= 0; @@ -223,7 +223,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_TO_OFFHEAP, EVT_CACHE_OBJECT_FROM_OFFHEAP); - GridCache<Integer, CacheValue> cache = grid(0).cache(null); + Cache<Integer, CacheValue> cache = grid(0).cache(null); populate(cache); evictAll(cache); @@ -286,7 +286,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { grid(0); - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 100; i++) { info("Putting: " + i); @@ -331,7 +331,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void populate(GridCacheProjection<Integer, CacheValue> cache) throws Exception { + private void populate(CacheProjection<Integer, CacheValue> cache) throws Exception { resetCounters(); for (int i = 0; i < ENTRY_CNT; i++) { @@ -342,7 +342,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { assert val != null; assert val.value() == i; - GridCacheEntry<Integer, CacheValue> entry = cache.entry(i); + CacheEntry<Integer, CacheValue> entry = cache.entry(i); assert entry != null; @@ -359,7 +359,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void evictAll(GridCache<Integer, CacheValue> cache) throws Exception { + private void evictAll(Cache<Integer, CacheValue> cache) throws Exception { resetCounters(); assertEquals(ENTRY_CNT, cache.size()); @@ -391,7 +391,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void query(GridCacheProjection<Integer, CacheValue> cache, + private void query(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -426,7 +426,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void unswap(GridCacheProjection<Integer, CacheValue> cache, + private void unswap(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -461,7 +461,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void unswapAll(GridCacheProjection<Integer, CacheValue> cache, + private void unswapAll(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -492,7 +492,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void get(GridCacheProjection<Integer, CacheValue> cache, + private void get(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -522,7 +522,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void peek(GridCacheProjection<Integer, CacheValue> cache, + private void peek(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { resetCounters(); @@ -561,10 +561,10 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param upperBound Upper key bound. * @throws Exception In case of error. */ - private void checkEntries(GridCacheProjection<Integer, CacheValue> cache, + private void checkEntries(CacheProjection<Integer, CacheValue> cache, int lowerBound, int upperBound) throws Exception { for (int i = lowerBound; i < upperBound; i++) { - GridCacheEntry<Integer, CacheValue> entry = cache.entry(i); + CacheEntry<Integer, CacheValue> entry = cache.entry(i); assert entry != null; assert entry.getKey() != null; @@ -582,7 +582,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { */ private static class CacheValue { /** Value. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java index d0575b8..5c9eee6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java @@ -31,8 +31,8 @@ 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for cache swap. @@ -77,7 +77,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { cacheCfg.setStartSize(startSize); if (onheap > 0) { - cacheCfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(onheap)); + cacheCfg.setEvictionPolicy(new CacheFifoEvictionPolicy(onheap)); cacheCfg.setOffHeapMaxMemory(80 * 1024L * 1024L * 1024L); // 10GB } @@ -180,7 +180,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - GridCache<Integer, Integer> cache = g.cache(null); + Cache<Integer, Integer> cache = g.cache(null); // int max = 17 * 1024 * 1024; int max = Integer.MAX_VALUE; @@ -210,7 +210,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - final GridCache<Integer, Integer> c = g.cache(null); + final Cache<Integer, Integer> c = g.cache(null); final long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index c4e55ff..1093dcc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -31,8 +31,8 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -52,7 +52,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -87,7 +87,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testTransform() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); checkTransform(primaryKey(cache)); @@ -168,7 +168,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemove() throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemove(primaryKey(c)); @@ -181,7 +181,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemoveByteArray() throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemoveByteArray(primaryKey(c)); @@ -195,7 +195,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemove(Integer key) throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); checkValue(key, null); @@ -219,7 +219,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveByteArray(Integer key) throws Exception { - GridCache<Integer, byte[]> c = grid(0).cache(null); + Cache<Integer, byte[]> c = grid(0).cache(null); checkValue(key, null); @@ -246,7 +246,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); @@ -271,7 +271,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveTxByteArray(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { - GridCache<Integer, byte[]> c = grid(0).cache(null); + Cache<Integer, byte[]> c = grid(0).cache(null); IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); @@ -296,7 +296,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPromote() throws Exception { - GridCache<Integer, TestValue> c = grid(0).cache(null); + Cache<Integer, TestValue> c = grid(0).cache(null); TestValue val = new TestValue(new byte[100 * 1024]); @@ -390,7 +390,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb for (int i = 0; i < 100; i++) map.put(i, i); - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); Map<Integer, Integer> map0 = c.getAll(map.keySet()); @@ -427,7 +427,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutGetRemoveObject() throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); checkPutGetRemoveObject(primaryKey(c)); @@ -441,7 +441,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveObject(Integer key) throws Exception { - GridCache<Integer, TestValue> c = grid(0).cache(null); + Cache<Integer, TestValue> c = grid(0).cache(null); checkValue(key, null); @@ -480,7 +480,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkPutGetRemoveObjectTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { - GridCache<Integer, TestValue> c = grid(0).cache(null); + Cache<Integer, TestValue> c = grid(0).cache(null); TestValue val = new TestValue(new byte[10]); @@ -508,7 +508,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb if (atomicityMode() == ATOMIC) return; - GridCache<Integer, TestValue> c = grid(0).cache(null); + Cache<Integer, TestValue> c = grid(0).cache(null); checkLockUnlock(primaryKey(c)); @@ -565,7 +565,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testUnswap() throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); checkUnswap(primaryKey(c)); @@ -579,7 +579,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ private void checkUnswap(Integer key) throws Exception { - GridCache<Integer, Integer> c = grid(0).cache(null); + Cache<Integer, Integer> c = grid(0).cache(null); for (int i = 0; i < gridCount(); i++) { assertEquals("Unexpected entries for grid: " + i, 0, grid(i).cache(null).offHeapEntriesCount()); @@ -612,7 +612,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * */ @SuppressWarnings("PublicInnerClass") - public static class TestEntryPredicate implements IgnitePredicate<GridCacheEntry<Integer, Integer>> { + public static class TestEntryPredicate implements IgnitePredicate<CacheEntry<Integer, Integer>> { /** */ private Integer expVal; @@ -624,7 +624,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb } /** {@inheritDoc} */ - @Override public boolean apply(GridCacheEntry<Integer, Integer> e) { + @Override public boolean apply(CacheEntry<Integer, Integer> e) { assertEquals(expVal, e.peek()); return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java index f7a3df9..0fc2c83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; /** * Tests that offheap entry is not evicted while cache entry is in use. @@ -91,7 +91,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri @Override protected void beforeTest() throws Exception { super.beforeTest(); - final GridCache<Integer, Object> cache = grid(0).cache(null); + final Cache<Integer, Object> cache = grid(0).cache(null); vals = new ArrayList<>(VALS); @@ -128,7 +128,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testPut() throws Exception { - final GridCache<Integer, Object> cache = grid(0).cache(null); + final Cache<Integer, Object> cache = grid(0).cache(null); GridTestUtils.runMultiThreaded(new Callable<Void>() { @Override public Void call() throws Exception { @@ -153,7 +153,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri * @throws Exception If failed. */ public void testRemove() throws Exception { - final GridCache<Integer, Object> cache = grid(0).cache(null); + final Cache<Integer, Object> cache = grid(0).cache(null); GridTestUtils.runMultiThreaded(new Callable<Void>() { @Override public Void call() throws Exception { @@ -251,7 +251,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri /** * */ - protected abstract static class TestPredicate implements P1<GridCacheEntry<Integer, Object>> { + protected abstract static class TestPredicate implements P1<CacheEntry<Integer, Object>> { /** */ protected String expVal; @@ -268,7 +268,7 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri } /** {@inheritDoc} */ - @Override public final boolean apply(GridCacheEntry<Integer, Object> e) { + @Override public final boolean apply(CacheEntry<Integer, Object> e) { assertNotNull(e); Object val = e.peek(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java index 5587a4c..cfd4c70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java @@ -40,10 +40,10 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(CacheMode.PARTITIONED); - ccfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); + ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL); ccfg.setOffHeapMaxMemory(0); - ccfg.setMemoryMode(GridCacheMemoryMode.OFFHEAP_TIERED); + ccfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED); cfg.setCacheConfiguration(ccfg); @@ -57,14 +57,14 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { try { Ignite ignite = startGrids(2); - GridCache<Object, Object> rmtCache = ignite.cache(null); + Cache<Object, Object> rmtCache = ignite.cache(null); int key = 0; while (!rmtCache.affinity().isPrimary(grid(1).localNode(), key)) key++; - GridCache<Object, Object> locCache = grid(1).cache(null); + Cache<Object, Object> locCache = grid(1).cache(null); try (IgniteTx tx = locCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { locCache.putxIfAbsent(key, 0); @@ -100,7 +100,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { try { Ignite grid = startGrid(0); - GridCache<Object, Object> cache = grid.cache(null); + Cache<Object, Object> cache = grid.cache(null); for (int i = 0; i < 30; i++) cache.put(i, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java index 61dccda..78a3684 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.internal.util.future.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Checks ordered preloading. @@ -126,7 +126,7 @@ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(0); try { - GridCache<Object, Object> cache = g.cache("first"); + Cache<Object, Object> cache = g.cache("first"); // Put some data into cache. for (int i = 0; i < 1000; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java index 5c3272d..74764a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -36,8 +36,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * @@ -56,7 +56,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { private final AtomicInteger idxGen = new AtomicInteger(); /** */ - private GridCachePreloadMode mode = SYNC; + private CachePreloadMode mode = SYNC; /** */ private boolean offheap; @@ -82,7 +82,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { repCacheCfg.setName("replicated"); repCacheCfg.setCacheMode(REPLICATED); repCacheCfg.setPreloadMode(mode); - repCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + repCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); repCacheCfg.setQueryIndexEnabled(false); repCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -97,7 +97,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { partCacheCfg.setCacheMode(PARTITIONED); partCacheCfg.setPreloadMode(mode); partCacheCfg.setAffinity(new GridCacheModuloAffinityFunction(11, 1)); - partCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + partCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); partCacheCfg.setEvictNearSynchronized(false); partCacheCfg.setQueryIndexEnabled(false); partCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -206,8 +206,8 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { Ignite ignite1 = startGrid(1); GridKernal grid2 = (GridKernal)startGrid(2); - GridCache<Integer, Object> cache1 = ignite1.cache(cacheName); - GridCache<Integer, Object> cache2 = grid2.cache(cacheName); + Cache<Integer, Object> cache1 = ignite1.cache(cacheName); + Cache<Integer, Object> cache2 = grid2.cache(cacheName); Object v1 = valCls.newInstance(); @@ -286,7 +286,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { * @throws InterruptedException If thread was interrupted. */ @SuppressWarnings({"BusyWait"}) - private boolean waitCacheEmpty(GridCacheProjection<Integer, Object> cache, long timeout) + private boolean waitCacheEmpty(CacheProjection<Integer, Object> cache, long timeout) throws InterruptedException { assert cache != null; assert timeout >= 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedAffinitySpreadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedAffinitySpreadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedAffinitySpreadTest.java index e5c9d21..b651e8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedAffinitySpreadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedAffinitySpreadTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; -import static org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction.*; +import static org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction.*; /** * @@ -44,7 +44,7 @@ public class GridCachePartitionedAffinitySpreadTest extends GridCommonAbstractTe for (int replicas = 128; replicas <= 4096; replicas*=2) { Collection<ClusterNode> nodes = createNodes(i, replicas); - GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(false, 10000); + CacheConsistentHashAffinityFunction aff = new CacheConsistentHashAffinityFunction(false, 10000); checkDistribution(aff, nodes); } @@ -71,7 +71,7 @@ public class GridCachePartitionedAffinitySpreadTest extends GridCommonAbstractTe * @param aff Affinity to check. * @param nodes Collection of nodes to test on. */ - private void checkDistribution(GridCacheConsistentHashAffinityFunction aff, Collection<ClusterNode> nodes) { + private void checkDistribution(CacheConsistentHashAffinityFunction aff, Collection<ClusterNode> nodes) { Map<ClusterNode, Integer> parts = new HashMap<>(nodes.size()); for (int part = 0; part < aff.getPartitions(); part++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java index 1816777..31864c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java @@ -33,9 +33,9 @@ import java.util.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.GridTopic.*; /** @@ -117,9 +117,9 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromPrimaryNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - GridCache<String, Integer> c = grid(i).cache(null); + Cache<String, Integer> c = grid(i).cache(null); - GridCacheEntry<String, Integer> e = c.entry(KEY); + CacheEntry<String, Integer> e = c.entry(KEY); if (e.primary()) { info("Primary node: " + grid(i).localNode().id()); @@ -138,9 +138,9 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromBackupNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - GridCache<String, Integer> c = grid(i).cache(null); + Cache<String, Integer> c = grid(i).cache(null); - GridCacheEntry<String, Integer> e = c.entry(KEY); + CacheEntry<String, Integer> e = c.entry(KEY); if (e.backup()) { info("Backup node: " + grid(i).localNode().id()); @@ -171,9 +171,9 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { */ public void testGetFromNearNode() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - GridCache<String, Integer> c = grid(i).cache(null); + Cache<String, Integer> c = grid(i).cache(null); - GridCacheEntry<String, Integer> e = c.entry(KEY); + CacheEntry<String, Integer> e = c.entry(KEY); if (!e.primary() && !e.backup()) { info("Near node: " + grid(i).localNode().id()); @@ -221,7 +221,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); - GridCacheEntry<String, Integer> e = g.<String, Integer>cache(null).entry(KEY); + CacheEntry<String, Integer> e = g.<String, Integer>cache(null).entry(KEY); if (e.primary()) { info("Primary node: " + g.cluster().localNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java index 099b7c6..8539d2d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java @@ -30,8 +30,8 @@ import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Partitioned affinity test for projections. @@ -55,7 +55,7 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(BACKUPS); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setPreloadMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java index 2365240..027d044 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.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.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; @@ -25,12 +26,11 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import javax.cache.configuration.*; 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.*; /** * Test that in {@link org.apache.ignite.cache.CacheMode#PARTITIONED} mode cache writes values only to the near cache store. <p/> This check @@ -55,7 +55,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(CacheMode.PARTITIONED); - cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setSwapEnabled(false); cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); @@ -91,7 +91,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { return null; } - @Override public void write(Cache.Entry<? extends Object, ? extends Object> entry) { + @Override public void write(javax.cache.Cache.Entry<? extends Object, ? extends Object> entry) { putCnt.incrementAndGet(); } @@ -102,7 +102,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { startGrid(); - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); try { cache.get(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java index 65ffefe..62f12a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java @@ -38,9 +38,9 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -100,7 +100,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest try { final Ignite ignite1 = startGrid(1); - GridCache<Integer, Object> cache1 = ignite1.cache(null); + Cache<Integer, Object> cache1 = ignite1.cache(null); for (int i = 0; i < 5000; i++) cache1.put(i, VALUE + i); @@ -121,7 +121,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest info("Started evicting..."); for (int i = 0; i < 3000 && !done.get(); i++) { - GridCacheEntry<Integer, Object> entry = randomEntry(ignite1); + CacheEntry<Integer, Object> entry = randomEntry(ignite1); if (entry != null) entry.evict(); @@ -161,7 +161,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest info("Evicting on constant topology."); for (int i = 0; i < 1000; i++) { - GridCacheEntry<Integer, Object> entry = randomEntry(ignite1); + CacheEntry<Integer, Object> entry = randomEntry(ignite1); if (entry != null) entry.evict(); @@ -204,7 +204,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest * @param g Grid. * @return Random entry from cache. */ - @Nullable private GridCacheEntry<Integer, Object> randomEntry(Ignite g) { + @Nullable private CacheEntry<Integer, Object> randomEntry(Ignite g) { GridKernal g1 = (GridKernal)g; return g1.<Integer, Object>internalCache().randomEntry(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java index 51b68a3..e2352ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java @@ -39,8 +39,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -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 putAll() method along with failover and different configurations. @@ -564,7 +564,7 @@ public class GridCachePutAllFailoverSelfTest 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/GridCachePutAllTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java index 0bc4309..09f5697 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllTask.java @@ -76,7 +76,7 @@ class GridCachePutAllTask extends ComputeTaskAdapter<Collection<Integer>, Void> @Override public Object execute() throws IgniteCheckedException { log.info("Going to put data: " + data); - GridCacheProjection<Object, Object> cache = ignite.cache(cacheName); + CacheProjection<Object, Object> cache = ignite.cache(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java index d8606ad..18e8e3d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java @@ -27,15 +27,15 @@ import java.io.*; @SuppressWarnings("unused") public class GridCacheQueryEmbeddedValue implements Serializable { /** Query embedded field. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private int embeddedField1 = 55; /** Query embedded field. */ - @GridCacheQuerySqlField(groups = {"grp1"}) + @CacheQuerySqlField(groups = {"grp1"}) private int embeddedField2 = 11; /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Val embeddedField3 = new Val(); /** @@ -43,7 +43,7 @@ public class GridCacheQueryEmbeddedValue implements Serializable { @SuppressWarnings("PublicInnerClass") public static class Val implements Serializable { /** */ - @GridCacheQuerySqlField + @CacheQuerySqlField private Long x = 3L; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java index 0bd9e47..b44cd9a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java @@ -49,7 +49,7 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { * @throws Exception If failed. */ public void testWithoutStoreLoad() throws Exception { - GridCache<Integer, CacheValue> cache = grid(0).cache(null); + Cache<Integer, CacheValue> cache = grid(0).cache(null); for (int i = 0; i < ENTRY_CNT; i++) cache.put(i, new CacheValue(i)); @@ -65,7 +65,7 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { for (int i = 0; i < ENTRY_CNT; i++) putToStore(i, new CacheValue(i)); - GridCache<Integer, CacheValue> cache0 = grid(0).cache(null); + Cache<Integer, CacheValue> cache0 = grid(0).cache(null); cache0.loadCache(null, 0); @@ -77,7 +77,7 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { * @param cache Cache. * @throws Exception If failed. */ - private void checkCache(GridCacheProjection<Integer,CacheValue> cache) throws Exception { + private void checkCache(CacheProjection<Integer,CacheValue> cache) throws Exception { assert cache.entrySet().size() == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.size(); assert cache.keySet().size() == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.size(); assert cache.values().size() == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.size(); @@ -89,8 +89,8 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { * @param backups Include backups flag. * @throws Exception If failed. */ - private void checkQuery(GridCacheProjection<Integer, CacheValue> cache, boolean backups) throws Exception { - GridCacheQuery<Map.Entry<Integer, CacheValue>> qry = cache.queries().createSqlQuery( + private void checkQuery(CacheProjection<Integer, CacheValue> cache, boolean backups) throws Exception { + CacheQuery<Map.Entry<Integer, CacheValue>> qry = cache.queries().createSqlQuery( CacheValue.class, "val >= 5"); if (backups) @@ -105,7 +105,7 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { * Test cache value. */ private static class CacheValue { - @GridCacheQuerySqlField + @CacheQuerySqlField private final int val; CacheValue(int val) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java index b32e1de..76a2997 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java @@ -91,7 +91,7 @@ public class GridCacheQueryIndexingDisabledSelfTest extends GridCacheAbstractSel * @throws IgniteCheckedException If failed. */ public void testScanQuery() throws IgniteCheckedException { - GridCacheQuery<Map.Entry<String, Integer>> qry = cache().queries().createScanQuery(null); + CacheQuery<Map.Entry<String, Integer>> qry = cache().queries().createScanQuery(null); qry.execute().get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java index b9990be..aaf73fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Test for http://gridgain.jira.com/browse/GG-3979. @@ -67,7 +67,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes @SuppressWarnings("unchecked") public void testInternalKeysPreloading() throws Exception { try { - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); for (int i = 0; i < ENTRY_CNT; i++) cache.dataStructures().queue("queue" + i, Integer.MAX_VALUE, false, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java index 99ace44..02eeeec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -35,7 +35,7 @@ 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.CacheDistributionMode.*; import static org.apache.ignite.testframework.GridTestUtils.*; /** @@ -64,7 +64,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(mode); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); @@ -312,7 +312,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - GridCache<Integer, TestValue> cache = g.cache(null); + Cache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -353,7 +353,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - GridCache<Integer, TestValue> cache = g.cache(null); + Cache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -386,7 +386,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - GridCache<Integer, TestValue> cache = g.cache(null); + Cache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -426,7 +426,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - GridCache<Integer, TestValue> cache = g.cache(null); + Cache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); @@ -463,7 +463,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); try { - GridCache<Integer, TestValue> cache = g.cache(null); + Cache<Integer, TestValue> cache = g.cache(null); refs.add(new WeakReference<Object>(cacheContext(cache))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java index 5c8fb7e..1f27160 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.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.eviction.lru.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -26,15 +27,14 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** - * Checks that GridCacheProjection.reload() operations are performed correctly. + * Checks that CacheProjection.reload() operations are performed correctly. */ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { /** Maximum allowed number of cache entries. */ @@ -77,7 +77,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setName(CACHE_NAME); cacheCfg.setCacheMode(cacheMode); - cacheCfg.setEvictionPolicy(new GridCacheLruEvictionPolicy(MAX_CACHE_ENTRIES)); + cacheCfg.setEvictionPolicy(new CacheLruEvictionPolicy(MAX_CACHE_ENTRIES)); cacheCfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY); final CacheStore store = new CacheStoreAdapter<Integer, Integer>() { @@ -85,7 +85,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { return key; } - @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Integer, ? extends Integer> e) { //No-op. } @@ -164,7 +164,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { Ignite ignite = startGrid(); try { - GridCache<Integer, Integer> cache = ignite.cache(CACHE_NAME); + Cache<Integer, Integer> cache = ignite.cache(CACHE_NAME); for (int i = 0; i < N_ENTRIES; i++) cache.reload(i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java index 8a207de..4750948 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java @@ -38,7 +38,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test cases for preload tests. @@ -104,7 +104,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract try { Ignite firstIgnite = startGrid("1"); - GridCache<Integer, String> firstCache = firstIgnite.cache(null); + Cache<Integer, String> firstCache = firstIgnite.cache(null); for (int i = 0; i < ADDITION_CACHE_NUMBER; i++) startGrid(String.valueOf(i + 2)); @@ -134,8 +134,8 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract Ignite ignite3 = startGrid("3"); - GridCache<Integer, String> cache1 = ignite1.cache(null); - GridCache<Integer, String> cache3 = ignite3.cache(null); + Cache<Integer, String> cache1 = ignite1.cache(null); + Cache<Integer, String> cache3 = ignite3.cache(null); IgniteFuture<?> fut = multithreadedAsync( new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedTxStoreExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedTxStoreExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedTxStoreExceptionSelfTest.java index e7ab572..aab23be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedTxStoreExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedTxStoreExceptionSelfTest.java @@ -19,7 +19,7 @@ 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.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -32,7 +32,7 @@ public class GridCacheReplicatedTxStoreExceptionSelfTest extends IgniteTxStoreEx } /** {@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/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java index 933c9a6..c38ae1c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -28,7 +28,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; 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.*; /** @@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest { /** Distribution mode. */ - private GridCacheDistributionMode distroMode; + private CacheDistributionMode distroMode; /** Atomicity mode. */ private CacheAtomicityMode atomicityMode; @@ -127,11 +127,11 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest writeOrderMode = order; - distroMode = GridCacheDistributionMode.PARTITIONED_ONLY; + distroMode = CacheDistributionMode.PARTITIONED_ONLY; startGrids(2); - distroMode = GridCacheDistributionMode.CLIENT_ONLY; + distroMode = CacheDistributionMode.CLIENT_ONLY; startGrid(2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java index 140063a..66fa493 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java @@ -114,7 +114,7 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest { cache.context().tm().slowTxWarnTimeout(500); } - GridCache<Object, Object> cache1 = g.cache(cacheName); + Cache<Object, Object> cache1 = g.cache(cacheName); IgniteTx tx = cache1.txStart(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java index b051b80..51fc5a4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java @@ -131,7 +131,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { final CountDownLatch readyLatch = new CountDownLatch(PUT_THREADS); - 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/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java index f87533c..4c024c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.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.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -28,14 +29,13 @@ import org.apache.ignite.transactions.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.atomic.*; 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.*; /** * Tests for reproduce problem with GG-6895: @@ -100,7 +100,7 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testPutxShouldNotTriggerLoadWithTx() throws Exception { - GridCache<Integer, Integer> cache = cache(); + Cache<Integer, Integer> cache = cache(); try (IgniteTx tx = cache.txStart()) { assertTrue(cache.putx(1, 1)); @@ -132,12 +132,12 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> entry) { + @Override public void write(javax.cache.Cache.Entry<? extends Integer, ? extends Integer> entry) { // No-op. } /** {@inheritDoc} */ - @Override public void writeAll(Collection<Cache.Entry<? extends Integer, ? extends Integer>> entries) { + @Override public void writeAll(Collection<javax.cache.Cache.Entry<? extends Integer, ? extends Integer>> entries) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java index 33b546d..311f394 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for {@link org.apache.ignite.cache.CacheConfiguration#isStoreValueBytes()}. @@ -78,7 +78,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { Ignite g0 = startGrid(0); Ignite g1 = startGrid(1); - GridCache<Integer, String> c = g0.cache(null); + Cache<Integer, String> c = g0.cache(null); c.put(1, "Cached value"); @@ -99,7 +99,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { Ignite g0 = startGrid(0); Ignite g1 = startGrid(1); - GridCache<Integer, String> c = g0.cache(null); + Cache<Integer, String> c = g0.cache(null); c.put(1, "Cached value");
