http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java index 6f4cd19..792a896 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Cache sequence basic tests.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java index 9ca5199..c502179 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * AtomicReference basic tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java index 32504df..7d268b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * AtomicReference and AtomicStamped multi node tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java index 65e9c13..7810c6f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -67,7 +67,7 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom dfltCacheCfg.setCacheMode(PARTITIONED); dfltCacheCfg.setBackups(1); - dfltCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dfltCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dfltCacheCfg.setAtomicSequenceReserveSize(10); dfltCacheCfg.setAtomicityMode(TRANSACTIONAL); dfltCacheCfg.setDistributionMode(NEAR_PARTITIONED); @@ -168,10 +168,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.incrementAndGet(); } }, seq, ITERATION_NUM, THREAD_NUM); @@ -184,10 +184,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.incrementAndGet(); } }, seq, ITERATION_NUM, THREAD_NUM); @@ -200,10 +200,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.getAndIncrement(); } }, seq, ITERATION_NUM, THREAD_NUM); @@ -216,10 +216,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.getAndIncrement(); } }, seq, ITERATION_NUM, THREAD_NUM); @@ -232,10 +232,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.addAndGet(5); } }, seq, ITERATION_NUM, THREAD_NUM); @@ -248,10 +248,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.getAndAdd(5); } }, seq, ITERATION_NUM, THREAD_NUM); @@ -264,10 +264,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.incrementAndGet(); t.getAndIncrement(); t.incrementAndGet(); @@ -285,10 +285,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom // Random sequence names. String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); - runSequenceClosure(new GridInUnsafeClosure<GridCacheAtomicSequence>() { - @Override public void apply(GridCacheAtomicSequence t) throws IgniteCheckedException { + runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() { + @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException { t.getAndAdd(2); t.addAndGet(3); t.addAndGet(5); @@ -308,8 +308,8 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom * @param threadCnt Thread count. * @throws Exception If failed. */ - protected void runSequenceClosure(final GridInUnsafeClosure<GridCacheAtomicSequence> c, - final GridCacheAtomicSequence seq, final int cnt, final int threadCnt) throws Exception { + protected void runSequenceClosure(final GridInUnsafeClosure<CacheAtomicSequence> c, + final CacheAtomicSequence seq, final int cnt, final int threadCnt) throws Exception { multithreaded(new Runnable() { @Override public void run() { try { @@ -331,7 +331,7 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom private void checkUpdate(boolean updated) throws Exception { String seqName = UUID.randomUUID().toString(); - final GridCacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); + final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true); long curVal = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java index 137b89c..75e8089 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java @@ -23,9 +23,9 @@ import org.apache.ignite.internal.processors.cache.datastructures.*; 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.*; /** * AtomicReference basic tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java index 8e7ca41..c8eedbe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java @@ -26,8 +26,8 @@ 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.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -59,7 +59,7 @@ public class GridCachePartitionedNodeRestartSelfTest extends GridCommonAbstractT cc.setBackups(1); cc.setWriteSynchronizationMode(FULL_SYNC); cc.setPreloadMode(SYNC); - cc.setEvictionPolicy(new GridCacheFifoEvictionPolicy(100)); + cc.setEvictionPolicy(new CacheFifoEvictionPolicy(100)); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java index af43833..e5472f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java @@ -31,11 +31,11 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test with variable number of nodes. @@ -211,7 +211,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac assert PARTITIONED == grid(i).cache(null).configuration().getCacheMode(); - GridCacheAtomicLong atomic = grid(i).cache(null).dataStructures().atomicLong(name, 0, true); + CacheAtomicLong atomic = grid(i).cache(null).dataStructures().atomicLong(name, 0, true); long val = atomic.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java index cf39196..dd15b73 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java @@ -23,9 +23,9 @@ import org.apache.ignite.internal.processors.cache.datastructures.*; 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.*; /** * Queue tests with 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/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 66db2e6..97b69fd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -35,10 +35,10 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; 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.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -96,11 +96,11 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon info("Started grid: " + locNodeId); - GridCache<String, ?> cache = ignite.cache(null); + Cache<String, ?> cache = ignite.cache(null); info("Creating queue: " + locNodeId); - GridCacheQueue<String> q = cache.dataStructures().queue("queue", 1, true, true); + CacheQueue<String> q = cache.dataStructures().queue("queue", 1, true, true); assert q != null; @@ -155,7 +155,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon // If output presents, test passes with greater probability. // info("Start puts."); - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); info("Partition: " + cache.affinity().partition(1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index 490ded9..2401115 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -37,7 +37,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Cache queue test with changing topology. @@ -104,7 +104,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra @Override public Void call() throws IgniteCheckedException { Ignite ignite = grid(0); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAP, + CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAP, true, true); for (int i = 0; i < QUEUE_CAP * 2; i++) { @@ -144,7 +144,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra @Override public Void call() throws IgniteCheckedException { Ignite ignite = grid(GRID_CNT); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures(). + CacheQueue<Integer> queue = ignite.cache(null).dataStructures(). queue(queueName, Integer.MAX_VALUE, true, true); int cnt = 0; @@ -192,8 +192,8 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra * @throws Exception If failed. */ private void startAdditionalNodes(int cnt, String queueName) throws Exception { - GridCacheAffinityFunction aff = cache(0).configuration().getAffinity(); - GridCacheAffinityKeyMapper mapper = cache(0).configuration().getAffinityMapper(); + CacheAffinityFunction aff = cache(0).configuration().getAffinity(); + CacheAffinityKeyMapper mapper = cache(0).configuration().getAffinityMapper(); assertNotNull(aff); assertNotNull(mapper); @@ -245,7 +245,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra * @param nodes Topology nodes. * @return Affinity nodes for partition. */ - private Collection<ClusterNode> nodes(GridCacheAffinityFunction aff, int part, Collection<ClusterNode> nodes) { + private Collection<ClusterNode> nodes(CacheAffinityFunction aff, int part, Collection<ClusterNode> nodes) { List<List<ClusterNode>> assignment = aff.assignPartitions( new GridCacheAffinityFunctionContextImpl(new ArrayList<>(nodes), null, null, 1, BACKUP_CNT)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java index 42d7207..0ba03a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java @@ -23,9 +23,9 @@ import org.apache.ignite.internal.processors.cache.datastructures.*; 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.*; /** * Test that joined node is able to poll values from cache queue in partitioned configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java index 5256d37..ea11627 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.internal.processors.cache.datastructures.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Queue multi node test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java index 3c93232..ff459b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java @@ -21,9 +21,9 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Queue multi node tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java index 632ffc3..33d1dd4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.internal.processors.cache.datastructures.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Cache sequence basic tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java index 6e97b64..f6dd5b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.internal.processors.cache.datastructures.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Sequence multi node tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java index 4bf6ea5..b8b5ae2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * AtomicReference tests with replicated cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java index eabe926..8929111 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * AtomicReference and AtomicStamped tests with replicated cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java index 2dc3379..629e3b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * AtomicReference tests with replicated cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java index 3666fa6..fb7e23a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Queue tests with replicated cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java index 36f6ef9..2dbc8d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Queue multi node test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java index 613a812..db3b060 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Queue rotative multi node tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java index 1133eaf..cf6c192 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Cache sequence basic tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java index f5b3864..c359c71 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Sequence multi node tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index 61c4ff2..28677d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -40,13 +40,13 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend protected static Ignite[] ignites; /** Regular caches. */ - private static GridCache<Integer, Object>[] caches; + private static Cache<Integer, Object>[] caches; /** Offheap values caches. */ - private static GridCache<Integer, Object>[] cachesOffheap; + private static Cache<Integer, Object>[] cachesOffheap; /** Offheap tiered caches. */ - private static GridCache<Integer, Object>[] cachesOffheapTiered; + private static Cache<Integer, Object>[] cachesOffheapTiered; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -142,9 +142,9 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend ignites = new Ignite[gridCnt]; - caches = new GridCache[gridCnt]; - cachesOffheap = new GridCache[gridCnt]; - cachesOffheapTiered = new GridCache[gridCnt]; + caches = new Cache[gridCnt]; + cachesOffheap = new Cache[gridCnt]; + cachesOffheapTiered = new Cache[gridCnt]; for (int i = 0; i < gridCnt; i++) { ignites[i] = startGrid(i); @@ -280,14 +280,14 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @throws Exception If failed. */ public void testSwap() throws Exception { - for (GridCache<Integer, Object> cache : caches) + for (Cache<Integer, Object> cache : caches) assert cache.configuration().isSwapEnabled(); byte[] val1 = wrap(1); - GridCache<Integer, Object> primaryCache = null; + Cache<Integer, Object> primaryCache = null; - for (GridCache<Integer, Object> cache : caches) { + for (Cache<Integer, Object> cache : caches) { if (cache.entry(SWAP_TEST_KEY).primary()) { primaryCache = cache; @@ -317,7 +317,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val Value. * @throws Exception If failed. */ - private void testTransaction0(GridCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, + private void testTransaction0(Cache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed0(caches, concurrency, key, val, null, null); } @@ -333,9 +333,9 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed0(GridCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, + private void testTransactionMixed0(Cache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { - for (GridCache<Integer, Object> cache : caches) { + for (Cache<Integer, Object> cache : caches) { IgniteTx tx = cache.txStart(concurrency, REPEATABLE_READ); try { @@ -350,7 +350,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend tx.close(); } - for (GridCache<Integer, Object> cacheInner : caches) { + for (Cache<Integer, Object> cacheInner : caches) { tx = cacheInner.txStart(concurrency, REPEATABLE_READ); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index 5e0c721..e7f724f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -33,7 +33,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -77,7 +77,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - GridCacheProjection<String, int[]> cache = grid(0).cache(null).flagsOn(SYNC_COMMIT). + CacheProjection<String, int[]> cache = grid(0).cache(null).flagsOn(SYNC_COMMIT). projection(String.class, int[].class); cache.removeAll(); @@ -85,7 +85,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); - GridCache<String, int[]> c = g.cache(null); + Cache<String, int[]> c = g.cache(null); assertEquals("Cache is not empty: " + c.entrySet(), 0, c.size()); } @@ -131,7 +131,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra private Ignite ignite; @Override public Void applyx(final Integer i) throws IgniteCheckedException { - GridCache<String, int[]> cache = this.ignite.cache(null); + Cache<String, int[]> cache = this.ignite.cache(null); try (IgniteTx tx = cache.txStart(concur, isolation)) { int[] arr = cache.get("TestKey"); @@ -162,7 +162,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra fut.get(); // Wait for completion. for (int i = 0; i < GRID_CNT; i++) { - GridCacheProjection<String, int[]> c = grid(i).cache(null).projection(String.class, int[].class); + CacheProjection<String, int[]> c = grid(i).cache(null).projection(String.class, int[].class); // Do within transaction to make sure that lock is acquired // which means that all previous transactions have committed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 1c22ae9..9e87e57 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheConfiguration.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -75,7 +75,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs private static volatile int idx = -1; /** Preload mode. */ - protected GridCachePreloadMode preloadMode = ASYNC; + protected CachePreloadMode preloadMode = ASYNC; /** */ protected int preloadBatchSize = DFLT_BATCH_SIZE; @@ -162,7 +162,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs startGrids(); try { - GridCache<Integer, String> c = grid(idx).cache(CACHE_NAME); + Cache<Integer, String> c = grid(idx).cache(CACHE_NAME); for (int j = 0; j < retries; j++) { for (int i = 0; i < keyCnt; i++) @@ -195,7 +195,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs * @param attempt Attempt. * @throws Exception If failed. */ - private void checkGet(GridCache<Integer, String> c, int attempt) throws Exception { + private void checkGet(Cache<Integer, String> c, int attempt) throws Exception { for (int i = 0; i < keyCnt; i++) { String v = c.get(i); @@ -495,7 +495,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs info("Starting put thread..."); - GridCache<Integer, String> cache = grid(gridIdx).cache(CACHE_NAME); + Cache<Integer, String> cache = grid(gridIdx).cache(CACHE_NAME); while (System.currentTimeMillis() < endTime && err.get() == null) { int key = RAND.nextInt(keyCnt); @@ -615,7 +615,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs UUID locNodeId = ignite.cluster().localNode().id(); - GridCache<Integer, String> cache = ignite.cache(CACHE_NAME); + Cache<Integer, String> cache = ignite.cache(CACHE_NAME); List<Integer> keys = new ArrayList<>(txKeys); @@ -765,7 +765,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs UUID locNodeId = ignite.cluster().localNode().id(); - GridCache<Integer, String> cache = ignite.cache(CACHE_NAME); + Cache<Integer, String> cache = ignite.cache(CACHE_NAME); List<Integer> keys = new ArrayList<>(txKeys); @@ -876,7 +876,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs * @param key Key. * @param attempt Attempt. */ - private void printFailureDetails(GridCache<Integer, String> c, int key, int attempt) { + private void printFailureDetails(Cache<Integer, String> c, int key, int attempt) { error("*** Failure details ***"); error("Key: " + key); error("Partition: " + c.configuration().getAffinity().partition(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java index 4e852ba..5748f5e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java @@ -21,9 +21,9 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -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.*; /** * Tests for byte array values in PARTITIONED caches. @@ -96,5 +96,5 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend /** * @return Distribution mode. */ - protected abstract GridCacheDistributionMode distributionMode(); + protected abstract CacheDistributionMode distributionMode(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index 66c75b9..770c723 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -27,10 +27,10 @@ import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test ensuring that PRIMARY_SYNC mode works correctly. @@ -81,7 +81,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs /** * @return Distribution mode. */ - protected abstract GridCacheDistributionMode distributionMode(); + protected abstract CacheDistributionMode distributionMode(); /** * @throws Exception If failed. @@ -89,7 +89,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs public void testPrimarySync() throws Exception { for (int i = 0; i < GRID_CNT; i++) { for (int j = 0; j < GRID_CNT; j++) { - GridCache<Integer, Integer> cache = grid(j).cache(null); + Cache<Integer, Integer> cache = grid(j).cache(null); if (cache.entry(i).primary()) { try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index 565aff7..1205ae9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -39,9 +39,9 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests timeout exception when message gets lost. @@ -113,7 +113,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { TestCommunicationSpi commSpi = (TestCommunicationSpi)grid(0).configuration().getCommunicationSpi(); - GridCache<Object, Object> cache = ignite.cache(null); + Cache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); @@ -145,7 +145,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testNearUpdateResponseLost() throws Exception { Ignite ignite = grid(0); - GridCache<Object, Object> cache = ignite.cache(null); + Cache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); @@ -179,7 +179,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testDhtUpdateRequestLost() throws Exception { Ignite ignite = grid(0); - GridCache<Object, Object> cache = ignite.cache(null); + Cache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); @@ -214,7 +214,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { public void testDhtUpdateResponseLost() throws Exception { Ignite ignite = grid(0); - GridCache<Object, Object> cache = ignite.cache(null); + Cache<Object, Object> cache = ignite.cache(null); int key = keyForTest(); @@ -249,7 +249,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { private int keyForTest() { int i = 0; - GridCacheAffinity<Object> aff = grid(0).cache(null).affinity(); + CacheAffinity<Object> aff = grid(0).cache(null).affinity(); while (!aff.isPrimary(grid(1).localNode(), i) || !aff.isBackup(grid(2).localNode(), i)) i++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index d904d99..8a9397c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -100,9 +100,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes CacheEventListener lsnr = new CacheEventListener(latch); try { - GridCache<String, String> cache1 = ignite1.cache(null); - GridCache<String, String> cache2 = ignite2.cache(null); - GridCache<String, String> cache3 = ignite3.cache(null); + Cache<String, String> cache1 = ignite1.cache(null); + Cache<String, String> cache2 = ignite2.cache(null); + Cache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); @@ -175,9 +175,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes CacheEventListener lsnr = new CacheEventListener(latch); try { - GridCache<String, String> cache1 = ignite1.cache(null); - GridCache<String, String> cache2 = ignite2.cache(null); - GridCache<String, String> cache3 = ignite3.cache(null); + Cache<String, String> cache1 = ignite1.cache(null); + Cache<String, String> cache2 = ignite2.cache(null); + Cache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); @@ -253,9 +253,9 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes IgnitePredicate<IgniteEvent> lsnr = new CacheEventListener(latch); try { - GridCache<String, String> cache1 = ignite1.cache(null); - GridCache<String, String> cache2 = ignite2.cache(null); - GridCache<String, String> cache3 = ignite3.cache(null); + Cache<String, String> cache1 = ignite1.cache(null); + Cache<String, String> cache2 = ignite2.cache(null); + Cache<String, String> cache3 = ignite3.cache(null); ignite1.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index f80c8c7..2503168 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests near-only cache. @@ -69,7 +69,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst cfg.setCacheStoreFactory(null); cfg.setReadThrough(false); cfg.setWriteThrough(false); - cfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 32)); + cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 32)); cfg.setBackups(1); return cfg; @@ -96,7 +96,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst * @throws Exception If failed. */ public void testPutFromClientNode() throws Exception { - GridCache<Object, Object> nearOnly = nearOnlyCache(); + Cache<Object, Object> nearOnly = nearOnlyCache(); for (int i = 0; i < 5; i++) nearOnly.put(i, i); @@ -120,12 +120,12 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst * @throws Exception If failed. */ public void testGetFromClientNode() throws Exception { - GridCache<Object, Object> dht = dhtCache(); + Cache<Object, Object> dht = dhtCache(); for (int i = 0; i < 10; i++) dht.put(i, i); - GridCache<Object, Object> nearOnly = nearOnlyCache(); + Cache<Object, Object> nearOnly = nearOnlyCache(); assert dht != nearOnly; @@ -152,7 +152,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst if (F.eq(g.name(), nearOnlyGridName)) { for (int k = 0; k < 10000; k++) { - GridCache<Object, Object> cache = g.cache(null); + Cache<Object, Object> cache = g.cache(null); String key = "key" + k; @@ -167,7 +167,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst boolean foundAffinityNode = false; for (int k = 0; k < 10000; k++) { - GridCache<Object, Object> cache = g.cache(null); + Cache<Object, Object> cache = g.cache(null); String key = "key" + k; @@ -187,7 +187,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst /** * @return Near only cache for this test. */ - protected GridCache<Object, Object> nearOnlyCache() { + protected Cache<Object, Object> nearOnlyCache() { assert nearOnlyGridName != null; return G.ignite(nearOnlyGridName).cache(null); @@ -196,7 +196,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst /** * @return DHT cache for this test. */ - protected GridCache<Object, Object> dhtCache() { + protected Cache<Object, Object> dhtCache() { for (int i = 0; i < gridCount(); i++) { if (!nearOnlyGridName.equals(grid(i).name())) return grid(i).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/distributed/GridCacheEntrySetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java index eb079fe..5e0c0be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -47,7 +47,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac } /** {@inheritDoc} */ - @Override protected GridCacheWriteSynchronizationMode writeSynchronization() { + @Override protected CacheWriteSynchronizationMode writeSynchronization() { return FULL_SYNC; } @@ -71,7 +71,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac log.info("Use cache " + idx); - GridCache<Object, Object> cache = grid(idx).cache(null); + Cache<Object, Object> cache = grid(idx).cache(null); for (int i = 0; i < 100; i++) putAndCheckEntrySet(cache); @@ -89,7 +89,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac * @param cache Cache. * @throws Exception If failed. */ - private void putAndCheckEntrySet(GridCache<Object, Object> cache) throws Exception { + private void putAndCheckEntrySet(Cache<Object, Object> cache) throws Exception { try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer total = (Integer) cache.get(TX_KEY); @@ -98,9 +98,9 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac int cntr = 0; - Set<GridCacheEntry<Object, Object>> entries = cache.entrySet(); + Set<CacheEntry<Object, Object>> entries = cache.entrySet(); - for (GridCacheEntry e : entries) { + for (CacheEntry e : entries) { if (e.getKey() instanceof Integer) cntr++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java index 25dfca8..aa3b705 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java @@ -37,8 +37,8 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.PARTITIONED_ONLY; + @Override protected CacheDistributionMode distributionMode() { + return CacheDistributionMode.PARTITIONED_ONLY; } /** {@inheritDoc} */ @@ -49,7 +49,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setPreloadMode(GridCachePreloadMode.SYNC); + ccfg.setPreloadMode(CachePreloadMode.SYNC); return ccfg; } @@ -59,14 +59,14 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr */ public void testIteration() throws Exception { try { - final GridCache<String, Integer> cache = cache(); + final Cache<String, Integer> cache = cache(); final int entryCnt = 1000; for (int i = 0; i < entryCnt; i++) cache.put(String.valueOf(i), i); - Collection<GridCacheEntry<String, Integer>> entries = new ArrayList<>(10_000); + Collection<CacheEntry<String, Integer>> entries = new ArrayList<>(10_000); for (int i = 0; i < 10_000; i++) entries.add(cache.randomEntry()); @@ -75,7 +75,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr startGrid(2); startGrid(3); - for (GridCacheEntry<String, Integer> entry : entries) + for (CacheEntry<String, Integer> entry : entries) entry.partition(); for (int i = 0; i < entryCnt; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java index c8a8dc7..e620bcf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -138,7 +138,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ private void clearCaches() throws IgniteCheckedException { for (int i = 0; i < gridCnt; i++) { - GridCache<String, Integer> cache = cache(i); + Cache<String, Integer> cache = cache(i); cache.removeAll(); @@ -199,7 +199,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe * @throws Exception If test failed. */ public void testFilteredPut() throws Exception { - GridCache<String, Integer> cache = grid(0).cache(null); + Cache<String, Integer> cache = grid(0).cache(null); String key = "1"; int val = 1; @@ -227,7 +227,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe runTest( new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { String key = "key"; Integer val = 1; @@ -253,7 +253,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -285,7 +285,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -325,7 +325,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe return; runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -351,7 +351,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveAsyncTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -383,7 +383,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveAsyncTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -419,7 +419,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutRemovex() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -443,7 +443,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutRemovexTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -473,7 +473,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutRemovexTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; @@ -507,7 +507,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutIfAbsent() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); Map.Entry<String, Integer> e = iter.next(); @@ -538,7 +538,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutIfAbsentTx() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); IgniteTx tx = cache.txStart(); @@ -576,7 +576,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testPutIfAbsentAsync() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); Map.Entry<String, Integer> e = iter.next(); @@ -610,7 +610,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe IgniteBiTuple[] evts = new IgniteBiTuple[] {F.t(EVT_CACHE_OBJECT_PUT, 2 * gridCnt), F.t(EVT_CACHE_OBJECT_READ, 1)}; runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); // Optimistic transaction. @@ -648,13 +648,13 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testFilteredPutRemovex() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; - IgnitePredicate<GridCacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); - IgnitePredicate<GridCacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); + IgnitePredicate<CacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); + IgnitePredicate<CacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); String key = e.getKey(); Integer val = e.getValue(); @@ -677,15 +677,15 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testFilteredPutRemovexTx1() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { assert cache.keySet().isEmpty() : "Key set is not empty: " + cache().keySet(); Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; - IgnitePredicate<GridCacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); - IgnitePredicate<GridCacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); + IgnitePredicate<CacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); + IgnitePredicate<CacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); String key = e.getKey(); Integer val = e.getValue(); @@ -715,13 +715,13 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testFilteredPutRemovexTx2() throws Exception { runTest(new TestCacheRunnable() { - @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { + @Override public void run(Cache<String, Integer> cache) throws IgniteCheckedException { Map.Entry<String, Integer> e = F.first(pairs(1).entrySet()); assert e != null; - IgnitePredicate<GridCacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); - IgnitePredicate<GridCacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); + IgnitePredicate<CacheEntry<String, Integer>> noPeekVal = F.cacheNoPeekValue(); + IgnitePredicate<CacheEntry<String, Integer>> hasPeekVal = F.cacheHasPeekValue(); String key = e.getKey(); Integer val = e.getValue(); @@ -758,7 +758,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe * @param cache Cache. * @throws IgniteCheckedException If any exception occurs. */ - void run(GridCache<String, Integer> cache) throws IgniteCheckedException; + void run(Cache<String, Integer> cache) throws IgniteCheckedException; } /**
