http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java index 5eac583..d497b20 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.local; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -30,7 +30,7 @@ public class GridCacheLocalAtomicQueueApiSelfTest extends GridCacheLocalQueueApi @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - GridCacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; + CacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; ccfg.setAtomicityMode(ATOMIC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java index b6bcc22..202e964 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.local; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -33,7 +33,7 @@ public class GridCacheLocalQueueApiSelfTest extends GridCacheQueueApiSelfAbstrac IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(LOCAL); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java index a119946..2d8642c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/local/GridCacheLocalSequenceApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.local; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -33,7 +33,7 @@ public class GridCacheLocalSequenceApiSelfTest extends GridCacheSequenceApiSelfA IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(LOCAL); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java index 94a48e4..a7c4dbe 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -31,7 +31,7 @@ public class GridCachePartitionedAtomicQueueApiSelfTest extends GridCachePartiti @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - GridCacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; + CacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; ccfg.setAtomicityMode(ATOMIC); ccfg.setAtomicWriteOrderMode(PRIMARY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java index 225cb47..073ad36 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -28,8 +28,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; public class GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest extends GridCachePartitionedQueueCreateMultiNodeSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration ccfg = super.cacheConfiguration(); + @Override protected CacheConfiguration cacheConfiguration() { + CacheConfiguration ccfg = super.cacheConfiguration(); ccfg.setAtomicityMode(ATOMIC); ccfg.setAtomicWriteOrderMode(PRIMARY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java index 267f31d..73f2e6f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -31,7 +31,7 @@ public class GridCachePartitionedAtomicQueueMultiNodeSelfTest extends GridCacheP @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; + CacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; ccfg.setAtomicityMode(ATOMIC); ccfg.setAtomicWriteOrderMode(PRIMARY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java index 115b3ab..0ec6192 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -32,7 +32,7 @@ public class GridCachePartitionedAtomicQueueRotativeMultiNodeTest extends @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; + CacheConfiguration ccfg = cfg.getCacheConfiguration()[0]; ccfg.setAtomicityMode(ATOMIC); ccfg.setAtomicWriteOrderMode(PRIMARY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java index 47d10e0..d46255e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -34,7 +34,7 @@ public class GridCachePartitionedAtomicReferenceApiSelfTest extends GridCacheAto IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration cacheCfg = getCacheConfiguration(); + CacheConfiguration cacheCfg = getCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java index 7940068..a974043 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -34,7 +34,7 @@ public class GridCachePartitionedAtomicReferenceMultiNodeTest extends GridCacheA IgniteConfiguration cfg = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java index 03bf29c..98a5948 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -63,7 +64,7 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom cfg.setDiscoverySpi(disco); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(PARTITIONED); dfltCacheCfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetSelfTest.java index e434947..d7dd863 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; @@ -29,8 +30,8 @@ import static org.gridgain.grid.cache.GridCacheMode.*; */ public class GridCachePartitionedAtomicSetSelfTest extends GridCacheSetAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration ccfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(gridName); ccfg.setAtomicWriteOrderMode(PRIMARY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java index 588fbff..fc82816 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicStampedApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -36,7 +36,7 @@ public class GridCachePartitionedAtomicStampedApiSelfTest extends GridCacheAtomi IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java index 1f29eb4..246c4dc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.fifo.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -53,7 +53,7 @@ public class GridCachePartitionedNodeRestartSelfTest extends GridCommonAbstractT c.setDiscoverySpi(spi); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); cc.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java index 5df7c90..82569be 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -67,7 +67,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac cfg.setDiscoverySpi(spi); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java index 7e7e45b..62b6bc0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -36,7 +36,7 @@ public class GridCachePartitionedQueueApiSelfTest extends GridCacheQueueApiSelfA IgniteConfiguration c = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); cc.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 2859076..0ab2bca 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -65,8 +66,8 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon } /** {@inheritDoc} */ - protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cc = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration() { + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); cc.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index 4e5ca09..0ee51e1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -18,11 +18,10 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.processors.affinity.*; @@ -64,7 +63,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(BACKUP_CNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java index b84abfc..241c5df 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -36,7 +36,7 @@ public class GridCachePartitionedQueueJoinedNodeSelfTest extends GridCacheQueueJ IgniteConfiguration c = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); cc.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java index b4af4ae..3257825 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -35,7 +35,7 @@ public class GridCachePartitionedQueueMultiNodeSelfTest extends GridCacheQueueMu IgniteConfiguration c = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); cc.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java index 1d128a1..215ae87 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; @@ -34,7 +34,7 @@ public class GridCachePartitionedQueueRotativeMultiNodeTest extends GridCacheQue IgniteConfiguration cfg = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java index 0eae96f..e48b65f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -35,7 +35,7 @@ public class GridCachePartitionedSequenceApiSelfTest extends GridCacheSequenceAp IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(PARTITIONED); dfltCacheCfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java index 3af1e0c..1c96084 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.partitioned; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; @@ -35,7 +35,7 @@ public class GridCachePartitionedSequenceMultiNodeSelfTest extends GridCacheSequ IgniteConfiguration cfg = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java index 4de0e7d..4a08840 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -34,7 +34,7 @@ public class GridCacheReplicatedAtomicReferenceApiSelfTest extends GridCacheAtom IgniteConfiguration cfg = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cacheCfg = getCacheConfiguration(); + CacheConfiguration cacheCfg = getCacheConfiguration(); cacheCfg.setCacheMode(REPLICATED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java index 54a655b..d378765 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -34,7 +34,7 @@ public class GridCacheReplicatedAtomicReferenceMultiNodeTest extends GridCacheAt IgniteConfiguration cfg = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(REPLICATED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java index f2632e7..0acdeb5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -33,7 +33,7 @@ public class GridCacheReplicatedAtomicStampedApiSelfTest extends GridCacheAtomic IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(REPLICATED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java index 22ca720..4ddf68f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -34,7 +34,7 @@ public class GridCacheReplicatedQueueApiSelfTest extends GridCacheQueueApiSelfAb IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(REPLICATED); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java index 21e4607..d5930df 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -34,7 +34,7 @@ public class GridCacheReplicatedQueueMultiNodeSelfTest extends GridCacheQueueMul IgniteConfiguration c = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(REPLICATED); cc.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java index 6fa8bbb..1845309 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -34,7 +34,7 @@ public class GridCacheReplicatedQueueRotativeMultiNodeTest extends GridCacheQueu IgniteConfiguration cfg = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(REPLICATED); dfltCacheCfg.setPreloadMode(SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java index 053b085..a5fa010 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -33,7 +33,7 @@ public class GridCacheReplicatedSequenceApiSelfTest extends GridCacheSequenceApi IgniteConfiguration cfg = super.getConfiguration(); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(REPLICATED); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java index 0aabac7..c58a9b3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.datastructures.replicated; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import static org.gridgain.grid.cache.GridCacheMode.*; @@ -33,7 +33,7 @@ public class GridCacheReplicatedSequenceMultiNodeSelfTest extends GridCacheSeque IgniteConfiguration cfg = super.getConfiguration(gridName); // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(REPLICATED); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index 3bd852c..5417949 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; @@ -85,8 +86,8 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend /** * @return Cache configuration. */ - protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cfg = cacheConfiguration0(); + protected CacheConfiguration cacheConfiguration() { + CacheConfiguration cfg = cacheConfiguration0(); cfg.setName(CACHE_REGULAR); cfg.setPortableEnabled(portableEnabled()); @@ -97,13 +98,13 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend /** * @return Internal cache configuration. */ - protected abstract GridCacheConfiguration cacheConfiguration0(); + protected abstract CacheConfiguration cacheConfiguration0(); /** * @return Offheap cache configuration. */ - protected GridCacheConfiguration offheapCacheConfiguration() { - GridCacheConfiguration cfg = offheapCacheConfiguration0(); + protected CacheConfiguration offheapCacheConfiguration() { + CacheConfiguration cfg = offheapCacheConfiguration0(); cfg.setName(CACHE_OFFHEAP); cfg.setPortableEnabled(portableEnabled()); @@ -114,8 +115,8 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend /** * @return Offheap tiered cache configuration. */ - protected GridCacheConfiguration offheapTieredCacheConfiguration() { - GridCacheConfiguration cfg = offheapTieredCacheConfiguration0(); + protected CacheConfiguration offheapTieredCacheConfiguration() { + CacheConfiguration cfg = offheapTieredCacheConfiguration0(); cfg.setName(CACHE_OFFHEAP_TIERED); cfg.setPortableEnabled(portableEnabled()); @@ -126,12 +127,12 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend /** * @return Internal offheap cache configuration. */ - protected abstract GridCacheConfiguration offheapCacheConfiguration0(); + protected abstract CacheConfiguration offheapCacheConfiguration0(); /** * @return Internal offheap cache configuration. */ - protected abstract GridCacheConfiguration offheapTieredCacheConfiguration0(); + protected abstract CacheConfiguration offheapTieredCacheConfiguration0(); /** {@inheritDoc} */ @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 112fe53..4db00ef 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -31,7 +31,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheConfiguration.*; +import static org.apache.ignite.cache.CacheConfiguration.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java index e146113..d420dc4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; @@ -43,8 +44,8 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration0() { - GridCacheConfiguration cfg = new GridCacheConfiguration(); + @Override protected CacheConfiguration cacheConfiguration0() { + CacheConfiguration cfg = new CacheConfiguration(); cfg.setCacheMode(PARTITIONED); cfg.setAtomicityMode(TRANSACTIONAL); @@ -60,8 +61,8 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration offheapCacheConfiguration0() { - GridCacheConfiguration cfg = new GridCacheConfiguration(); + @Override protected CacheConfiguration offheapCacheConfiguration0() { + CacheConfiguration cfg = new CacheConfiguration(); cfg.setCacheMode(PARTITIONED); cfg.setAtomicityMode(TRANSACTIONAL); @@ -77,8 +78,8 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration offheapTieredCacheConfiguration0() { - GridCacheConfiguration cfg = new GridCacheConfiguration(); + @Override protected CacheConfiguration offheapTieredCacheConfiguration0() { + CacheConfiguration cfg = new CacheConfiguration(); cfg.setCacheMode(PARTITIONED); cfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index 38a8e21..b235eaa 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; @@ -46,7 +47,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); ccfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index bedf1c7..f679f8e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -18,11 +18,11 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; @@ -61,7 +61,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { cfg.setCommunicationSpi(commSpi); - GridCacheConfiguration ccfg = defaultCacheConfiguration(); + CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.setCacheMode(PARTITIONED); ccfg.setAtomicityMode(ATOMIC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index 27130de..5b5451b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -51,8 +52,8 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); if (gridCnt.getAndIncrement() == 0) { cfg.setDistributionMode(clientOnly() ? CLIENT_ONLY : NEAR_ONLY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java index 55a883b..dc416ee 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -46,8 +47,8 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr return GridCacheAtomicityMode.ATOMIC; } - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration ccfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(gridName); ccfg.setPreloadMode(GridCachePreloadMode.SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java index 5d390d3..eebb6ca 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.events.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; @@ -60,8 +61,8 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); cfg.setPreloadMode(SYNC); cfg.setStore(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java index f8a1636..f6adbe9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; @@ -82,8 +83,8 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { /** * @return Cache configuration. */ - protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration() { + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(cacheMode()); cacheCfg.setWriteSynchronizationMode(FULL_ASYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMixedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMixedModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMixedModeSelfTest.java index e1e195e..64d301e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMixedModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMixedModeSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; @@ -39,8 +40,8 @@ public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest { * @param gridName Grid name. * @return Cache configuration. */ - private GridCacheConfiguration cacheConfiguration(String gridName) { - GridCacheConfiguration cfg = new GridCacheConfiguration(); + private CacheConfiguration cacheConfiguration(String gridName) { + CacheConfiguration cfg = new CacheConfiguration(); cfg.setCacheMode(GridCacheMode.PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 6ba491e..33d6cf2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -195,7 +196,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra * @throws Exception If failed. */ private IgniteConfiguration configuration(int idx) throws Exception { - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setName(CACHE_NAME); ccfg.setCacheMode(cacheMode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java index 3f45121..d05ba9f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -70,7 +71,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra aff.setBackupFilter(backupFilter); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(BACKUPS); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index cb641c4..f0d0ffc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -18,11 +18,11 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -30,8 +30,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; import org.jdk8.backport.*; -import org.jetbrains.annotations.*; +import javax.cache.*; import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; @@ -68,7 +68,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid c.setDiscoverySpi(disco); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setDistributionMode(nearEnabled() ? NEAR_PARTITIONED : PARTITIONED_ONLY); @@ -158,11 +158,11 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid return map.get(key); } - @Override public void put(Integer key, @Nullable String val) { + @Override public void write(Cache.Entry<? extends Integer, ? extends String> e) { fail("Should not be called within the test."); } - @Override public void remove(Integer key) { + @Override public void delete(Object key) { fail("Should not be called within the test."); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java index af458d2..9e130a2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.gridgain.grid.cache.*; @@ -71,8 +72,8 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA /** * @return Cache configuration. */ - protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration() { + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(getCacheMode()); cacheCfg.setPreloadMode(SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index 56e3cb5..c56ba43 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; @@ -30,7 +31,7 @@ import org.gridgain.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheConfiguration.*; +import static org.apache.ignite.cache.CacheConfiguration.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; @@ -106,7 +107,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon c.setDeploymentMode(CONTINUOUS); // Cache. - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setName(CACHE_NAME); cc.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index c02930a..c574656 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -109,7 +110,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { tCfg.setDefaultTxConcurrency(txConcurrency); tCfg.setDefaultTxIsolation(txIsolation); - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setName(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index ae7b504..6bdf491 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; @@ -68,8 +69,8 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom * @param gridName Grid name. * @return Cache configuration. */ - public GridCacheConfiguration cacheConfiguration(String gridName) { - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + public CacheConfiguration cacheConfiguration(String gridName) { + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setAtomicityMode(TRANSACTIONAL); ccfg.setCacheMode(cacheMode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 06a882b..b1a108b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -252,8 +253,8 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); cfg.setStore(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index be741a6..e236757 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -439,8 +440,8 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); cfg.setStore(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 8ce5028..04341ee 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; @@ -204,8 +205,8 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); cfg.setPreloadMode(GridCachePreloadMode.ASYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java index 8d401d5..981b082 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; @@ -54,19 +55,19 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - GridCacheConfiguration atomicCacheCfg = cacheConfiguration0(); + CacheConfiguration atomicCacheCfg = cacheConfiguration0(); atomicCacheCfg.setName(CACHE_ATOMIC); atomicCacheCfg.setAtomicityMode(ATOMIC); atomicCacheCfg.setAtomicWriteOrderMode(PRIMARY); - GridCacheConfiguration atomicOffheapCacheCfg = offheapCacheConfiguration0(); + CacheConfiguration atomicOffheapCacheCfg = offheapCacheConfiguration0(); atomicOffheapCacheCfg.setName(CACHE_ATOMIC_OFFHEAP); atomicOffheapCacheCfg.setAtomicityMode(ATOMIC); atomicOffheapCacheCfg.setAtomicWriteOrderMode(PRIMARY); - GridCacheConfiguration atomicOffheapTieredCacheCfg = offheapTieredCacheConfiguration(); + CacheConfiguration atomicOffheapTieredCacheCfg = offheapTieredCacheConfiguration(); atomicOffheapTieredCacheCfg.setName(CACHE_ATOMIC_OFFHEAP_TIERED); atomicOffheapTieredCacheCfg.setAtomicityMode(ATOMIC);
