http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java index 3a7e4fb..51f3fce 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -74,8 +75,8 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac } /** {@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);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFlagsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFlagsTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFlagsTest.java index ae6b538..b4c2093 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFlagsTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFlagsTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; @@ -41,8 +42,8 @@ public abstract class GridCacheAbstractFlagsTest extends GridCacheAbstractSelfTe } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration c = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration c = super.cacheConfiguration(gridName); if (cacheMode() == GridCacheMode.PARTITIONED) c.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/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 870da16..fddb99a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -108,8 +109,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } /** {@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); if (offHeapValues()) { ccfg.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java index e04155e..3d4c289 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -53,8 +54,8 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr } /** {@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.setCacheMode(cacheMode()); cfg.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/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java index 2a07f73..2552783 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; @@ -37,6 +38,7 @@ import org.gridgain.testframework.junits.common.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.*; import java.util.*; import java.util.concurrent.atomic.*; @@ -226,8 +228,8 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @return Cache configuration. * @throws Exception In case of error. */ - protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setStore(cacheStore()); cfg.setSwapEnabled(swapEnabled()); @@ -247,7 +249,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * @return Default cache mode. */ protected GridCacheMode cacheMode() { - return GridCacheConfiguration.DFLT_CACHE_MODE; + return CacheConfiguration.DFLT_CACHE_MODE; } /** @@ -286,11 +288,11 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { return map.get(key); } - @Override public void put(Object key, @Nullable Object val) { - map.put(key, val); + @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) { + map.put(e.getKey(), e.getValue()); } - @Override public void remove(Object key) { + @Override public void delete(Object key) { map.remove(key); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java index 33af5ea..10e30bb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; @@ -39,8 +40,8 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT /** {@inheritDoc} */ @SuppressWarnings("NullableProblems") - @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.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/GridCacheAffinityApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityApiSelfTest.java index 989e847..cd53594 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityApiSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; @@ -40,8 +41,8 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { private static final Random RND = new Random(); /** {@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.setCacheMode(PARTITIONED); cfg.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/GridCacheAffinityRoutingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java index fdd7679..e710f0c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java @@ -18,13 +18,13 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -75,14 +75,14 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { if (!gridName.equals(getTestGridName(GRID_CNT))) { // Default cache configuration. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(PARTITIONED); dfltCacheCfg.setBackups(1); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); // Non-default cache configuration. - GridCacheConfiguration namedCacheCfg = defaultCacheConfiguration(); + CacheConfiguration namedCacheCfg = defaultCacheConfiguration(); namedCacheCfg.setCacheMode(PARTITIONED); namedCacheCfg.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/GridCacheAsyncOperationsLimitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java index 0bf7d9b..e295b92 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; @@ -37,8 +37,8 @@ public class GridCacheAsyncOperationsLimitSelfTest extends GridCacheAbstractSelf } /** {@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.setMaxConcurrentAsyncOperations(MAX_CONCURRENT_ASYNC_OPS); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java index e477600..9c2b6ff 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.*; @@ -64,7 +65,7 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest cfg.setDiscoverySpi(discoSpi); - GridCacheConfiguration cCfg = new GridCacheConfiguration(); + CacheConfiguration cCfg = new CacheConfiguration(); cCfg.setCacheMode(PARTITIONED); cCfg.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/GridCacheBasicStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java index 7f619b9..3af2b9c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; 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.*; @@ -79,7 +80,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract c.setDiscoverySpi(disco); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(cacheMode()); cc.setWriteSynchronizationMode(FULL_SYNC); @@ -476,7 +477,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract } for (int i = 1; i <= 10; i++) - store.put(i, "reloaded-" + i); + store.write(new CacheEntryImpl<>(i, "reloaded-" + i)); cache.reloadAll(vals.keySet()); @@ -543,7 +544,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract } for (int i = 1; i <= 10; i++) - store.put(i, "reloaded-" + i); + store.write(new CacheEntryImpl<>(i, "reloaded-" + i)); store.resetLastMethod(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java index c6d932a..a5ac312 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java @@ -17,15 +17,15 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; -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.vm.*; import org.gridgain.testframework.junits.common.*; -import org.jetbrains.annotations.*; +import javax.cache.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -70,7 +70,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC c.setDiscoverySpi(disco); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(cacheMode()); cc.setWriteSynchronizationMode(FULL_SYNC); @@ -95,12 +95,12 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC } /** {@inheritDoc} */ - @Override public void put(Integer key, @Nullable Integer val) { + @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) { assert false; } /** {@inheritDoc} */ - @Override public void remove(Integer key) { + @Override public void delete(Object key) { assert false; } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java index b8d4151..6105d55 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; @@ -72,14 +73,14 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration ccfgLoc = new GridCacheConfiguration(); + CacheConfiguration ccfgLoc = new CacheConfiguration(); ccfgLoc.setName(CACHE_LOCAL); ccfgLoc.setCacheMode(LOCAL); ccfgLoc.setWriteSynchronizationMode(FULL_SYNC); ccfgLoc.setAtomicityMode(TRANSACTIONAL); - GridCacheConfiguration ccfgPartitioned = new GridCacheConfiguration(); + CacheConfiguration ccfgPartitioned = new CacheConfiguration(); ccfgPartitioned.setName(CACHE_PARTITIONED); ccfgPartitioned.setCacheMode(PARTITIONED); @@ -89,7 +90,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { gridName.equals(getTestGridName(1)) ? NEAR_ONLY : CLIENT_ONLY); ccfgPartitioned.setAtomicityMode(TRANSACTIONAL); - GridCacheConfiguration ccfgColocated = new GridCacheConfiguration(); + CacheConfiguration ccfgColocated = new CacheConfiguration(); ccfgColocated.setName(CACHE_COLOCATED); ccfgColocated.setCacheMode(PARTITIONED); @@ -98,7 +99,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { ccfgColocated.setDistributionMode(PARTITIONED_ONLY); ccfgColocated.setAtomicityMode(TRANSACTIONAL); - GridCacheConfiguration ccfgReplicated = new GridCacheConfiguration(); + CacheConfiguration ccfgReplicated = new CacheConfiguration(); ccfgReplicated.setName(CACHE_REPLICATED); ccfgReplicated.setCacheMode(REPLICATED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java index 09c4baf..669ffd0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -43,7 +44,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(LOCAL); 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/GridCacheConcurrentMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapTest.java index f4be8b3..dbf5aff 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; @@ -41,7 +42,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(LOCAL); 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/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index 9f54ccf..ab225bc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -101,7 +102,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { c.getTransactionsConfiguration().setDefaultTxIsolation(REPEATABLE_READ); if (cacheOn) { - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(mode); cc.setDistributionMode(PARTITIONED_ONLY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index 0281403..77de2ce 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -18,11 +18,11 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.affinity.consistenthash.*; @@ -70,7 +70,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac private IgniteDeploymentMode depMode = SHARED; /** */ - private C1<GridCacheConfiguration, Void> initCache; + private C1<CacheConfiguration, Void> initCache; /** */ private boolean useStrLog; @@ -110,7 +110,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cfg.setDeploymentMode(depMode); if (cacheEnabled) { - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setName(cacheName); cacheCfg.setCacheMode(cacheMode); @@ -154,11 +154,11 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac } }, IgniteCheckedException.class, "Cache mode mismatch"); - final GridCacheConfiguration cfg1 = defaultCacheConfiguration(); + final CacheConfiguration cfg1 = defaultCacheConfiguration(); cfg1.setCacheMode(LOCAL); - final GridCacheConfiguration cfg2 = defaultCacheConfiguration(); + final CacheConfiguration cfg2 = defaultCacheConfiguration(); cfg2.setCacheMode(PARTITIONED); @@ -187,7 +187,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = null; depMode = SHARED; - assert startGrid(1).cache("myCache").configuration().getCacheMode() == GridCacheConfiguration.DFLT_CACHE_MODE; + assert startGrid(1).cache("myCache").configuration().getCacheMode() == CacheConfiguration.DFLT_CACHE_MODE; } /** @@ -306,16 +306,16 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAffinity(new GridCacheConsistentHashAffinityFunction() {/*No-op.*/}); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAffinity(new GridCacheConsistentHashAffinityFunction()); return null; } @@ -328,16 +328,16 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac */ public void testDifferentPreloadModes() throws Exception { checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setPreloadMode(NONE); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setPreloadMode(ASYNC); return null; } @@ -350,16 +350,16 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac */ public void testDifferentEvictionEnabled() throws Exception { checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy()); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { return null; } } @@ -371,16 +371,16 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac */ public void testDifferentEvictionPolicies() throws Exception { checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictionPolicy(new GridCacheRandomEvictionPolicy()); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy()); return null; } @@ -393,9 +393,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac */ public void testDifferentEvictionFilters() throws Exception { checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictionFilter(new GridCacheEvictionFilter<Object, Object>() { @Override public boolean evictAllowed(GridCacheEntry<Object, Object> entry) { return false; @@ -404,9 +404,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictionFilter(new GridCacheEvictionFilter<Object, Object>() { @Override public boolean evictAllowed(GridCacheEntry<Object, Object> entry) { return true; @@ -423,17 +423,17 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac */ public void testDifferentAffinityMappers() throws Exception { checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper() { }); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper()); return null; } @@ -448,17 +448,17 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictSynchronized(true); cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(100)); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictSynchronized(false); cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(100)); return null; @@ -474,19 +474,19 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @SuppressWarnings("deprecation") - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setDistributionMode(NEAR_PARTITIONED); cfg.setEvictNearSynchronized(true); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @SuppressWarnings("deprecation") - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setDistributionMode(NEAR_PARTITIONED); cfg.setEvictNearSynchronized(false); return null; @@ -502,17 +502,17 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setDistributionMode(PARTITIONED_ONLY); cfg.setAtomicityMode(ATOMIC); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setDistributionMode(PARTITIONED_ONLY); cfg.setAtomicityMode(TRANSACTIONAL); return null; @@ -528,16 +528,16 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setWriteSynchronizationMode(FULL_SYNC); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setWriteSynchronizationMode(FULL_ASYNC); return null; } @@ -550,14 +550,14 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac */ public void testAttributesError() throws Exception { checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cfg) { + new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cfg) { cfg.setQueryIndexEnabled(true); return null; } }, - new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cfg) { + new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cfg) { cfg.setQueryIndexEnabled(false); return null; } @@ -650,9 +650,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac public void testAttributesWarnings() throws Exception { cacheEnabled = true; - initCache = new C1<GridCacheConfiguration, Void>() { + initCache = new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAtomicSequenceReserveSize(1000); cfg.setCloner(new GridCacheCloner() { @Nullable @Override public <T> T cloneValue(T val) { @@ -670,9 +670,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac useStrLog = true; - initCache = new C1<GridCacheConfiguration, Void>() { + initCache = new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAtomicSequenceReserveSize(2 * 1000); cfg.setCloner(new GridCacheCloner() { @Nullable @Override public <T> T cloneValue(T val) { @@ -705,8 +705,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = REPLICATED; - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cfg) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictNearSynchronized(true); cfg.setNearEvictionPolicy(new GridCacheRandomEvictionPolicy()); return null; @@ -715,8 +715,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac startGrid(1); - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cfg) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictNearSynchronized(false); cfg.setNearEvictionPolicy(new GridCacheFifoEvictionPolicy()); return null; @@ -734,9 +734,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = LOCAL; - initCache = new C1<GridCacheConfiguration, Void>() { + initCache = new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAffinity(new GridCacheConsistentHashAffinityFunction() {/*No-op.*/}); cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy()); cfg.setStore(new TestStore()); @@ -746,9 +746,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac startGrid(1); - initCache = new C1<GridCacheConfiguration, Void>() { + initCache = new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setAffinity(new GridCacheConsistentHashAffinityFunction()); cfg.setEvictionPolicy(new GridCacheLruEvictionPolicy()); cfg.setStore(null); @@ -767,8 +767,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(ATOMIC); cc.setDistributionMode(PARTITIONED_ONLY); cc.setStore(new TestStore()); @@ -779,8 +779,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac startGrid(1); - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(ATOMIC); cc.setDistributionMode(CLIENT_ONLY); cc.setStore(null); @@ -800,8 +800,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(ATOMIC); cc.setDistributionMode(PARTITIONED_ONLY); cc.setStore(new TestStore()); @@ -812,8 +812,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac startGrid(1); - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(ATOMIC); cc.setDistributionMode(PARTITIONED_ONLY); cc.setStore(null); @@ -839,8 +839,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(PARTITIONED_ONLY); cc.setStore(new TestStore()); @@ -851,8 +851,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac startGrid(1); - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(PARTITIONED_ONLY); cc.setStore(null); @@ -878,8 +878,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(PARTITIONED_ONLY); cc.setStore(new TestStore()); @@ -890,8 +890,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac startGrid(1); - initCache = new C1<GridCacheConfiguration, Void>() { - @Override public Void apply(GridCacheConfiguration cc) { + initCache = new C1<CacheConfiguration, Void>() { + @Override public Void apply(CacheConfiguration cc) { cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(CLIENT_ONLY); cc.setStore(null); @@ -954,16 +954,16 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheMode = PARTITIONED; checkSecondGridStartFails( - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { cfg.setInterceptor(new GridCacheInterceptorAdapter() {/*No-op.*/}); return null; } }, - new C1<GridCacheConfiguration, Void>() { + new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ - @Override public Void apply(GridCacheConfiguration cfg) { + @Override public Void apply(CacheConfiguration cfg) { return null; } } @@ -975,8 +975,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac * @param initCache2 Closure. * @throws Exception If failed. */ - private void checkSecondGridStartFails(C1<GridCacheConfiguration, Void> initCache1, - C1<GridCacheConfiguration, Void> initCache2) throws Exception { + private void checkSecondGridStartFails(C1<CacheConfiguration, Void> initCache1, + C1<CacheConfiguration, Void> initCache2) throws Exception { cacheEnabled = true; initCache = initCache1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java index b4d67ba..f2b5b36 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.consistenthash.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -79,7 +79,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract cfg.setDiscoverySpi(spi); // Default cache config. - GridCacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); + CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(PARTITIONED); dfltCacheCfg.setPreloadMode(ASYNC); @@ -87,7 +87,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract dfltCacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction()); // Non-default cache configuration. - GridCacheConfiguration namedCacheCfg = defaultCacheConfiguration(); + CacheConfiguration namedCacheCfg = defaultCacheConfiguration(); namedCacheCfg.setCacheMode(PARTITIONED); namedCacheCfg.setPreloadMode(ASYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java index abb31d2..15966b0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; @@ -66,7 +67,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst c.setRestEnabled(false); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(cacheMode()); cc.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/GridCacheDeploymentOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java index 540ecdf..987e56f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMemoryMode.*; @@ -28,8 +28,8 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*; */ public class GridCacheDeploymentOffHeapSelfTest extends GridCacheDeploymentSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration() throws Exception { - GridCacheConfiguration cacheCfg = super.cacheConfiguration(); + @Override protected CacheConfiguration cacheConfiguration() throws Exception { + CacheConfiguration cacheCfg = super.cacheConfiguration(); cacheCfg.setQueryIndexEnabled(false); cacheCfg.setMemoryMode(OFFHEAP_VALUES); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java index 0ff4f51..072758d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.optimized.*; @@ -102,8 +103,8 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { * @return Cache configuration. * @throws Exception In case of error. */ - protected GridCacheConfiguration cacheConfiguration() throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration() throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(PARTITIONED); cfg.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/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index ceafdcc..e7dc681 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.optimized.*; @@ -103,7 +104,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(mode); cacheCfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java index cf96a76..a919910 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; @@ -52,7 +53,7 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest { discoSpi.setIpFinder(IP_FINDER); - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); 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/GridCacheEvictionEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java index fd9d631..4e1929e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -56,7 +57,7 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr c.setDiscoverySpi(disco); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(cacheMode()); cc.setAtomicityMode(atomicityMode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java index 963c681..3d9ea0b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -41,7 +41,7 @@ public class GridCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.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/GridCacheFinishPartitionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java index 8ddeb5e..fa3f01f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -64,7 +65,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - 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/GridCacheFullTextQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java index d5dfe00..f80708f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; @@ -51,8 +52,8 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra } /** {@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.setCacheMode(PARTITIONED); cfg.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/GridCacheGetAndTransformStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java index 9f6936e..e116448 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; @@ -78,7 +79,7 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm c.setDiscoverySpi(disco); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(cacheMode()); 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/GridCacheGlobalClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java index e973ffa..a582d6c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -61,7 +62,7 @@ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration ccfg = defaultCacheConfiguration(); + CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.setName(cacheName); 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/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index 51d782f..a42b977 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -35,8 +36,8 @@ import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import org.jdk8.backport.*; -import org.jetbrains.annotations.*; +import javax.cache.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -75,7 +76,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(cacheMode()); cacheCfg.setDistributionMode(nearEnabled() ? NEAR_PARTITIONED : PARTITIONED_ONLY); @@ -1260,21 +1261,21 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr } /** {@inheritDoc} */ - @Override public void putAll(Map<?, ?> map) { - storeMap.putAll(map); + @Override public void writeAll(Collection<Cache.Entry<? extends Object, ? extends Object>> entries) { + super.writeAll(entries); putCnt.incrementAndGet(); } /** {@inheritDoc} */ - @Override public void put(Object key, @Nullable Object val) { - storeMap.put(key, val); + @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) { + storeMap.put(e.getKey(), e.getValue()); putCnt.incrementAndGet(); } /** {@inheritDoc} */ - @Override public void remove(Object key) { + @Override public void delete(Object key) { storeMap.remove(key); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java index 4c4c107..d8abe0c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java @@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.cache; import com.google.common.collect.*; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -438,7 +439,7 @@ public class GridCacheGroupLockFailoverSelfTest extends GridCommonAbstractTest { cfg.setUserAttributes(ImmutableMap.of("segment", "worker")); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(GridCacheMode.PARTITIONED); cacheCfg.setStartSize(4500000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java index 982e762..f6f7e9c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -60,7 +59,7 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = new GridCacheConfiguration(); + CacheConfiguration cache = new CacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.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/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index 682120a..3ed86d0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -80,8 +81,8 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst } /** {@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); assertNotNull(interceptor); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java index ce70258..4774209 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; @@ -59,8 +60,8 @@ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { /** * @return Cache configuration. */ - private GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration() { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(PARTITIONED); cfg.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/GridCacheKeyCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java index 5d670de..3a01bb7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -66,8 +67,8 @@ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { /** * @return Cache configuration. */ - protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration() { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setCacheMode(PARTITIONED); cfg.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/GridCacheLeakTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java index 5b6a0d9..43fe30a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.rendezvous.*; @@ -66,8 +67,8 @@ public class GridCacheLeakTest extends GridCommonAbstractTest { * * @return Data cache configuration. */ - protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration() { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.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/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java index bed5aa4..4613f3e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -18,13 +18,13 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.cloner.*; @@ -40,7 +40,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; /** - * Test for {@link LifecycleAware} support in {@link GridCacheConfiguration}. + * Test for {@link LifecycleAware} support in {@link org.apache.ignite.cache.CacheConfiguration}. */ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTest { /** */ @@ -82,7 +82,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public void writeAll(Collection collection) { + @Override public void writeAll(Collection col) { // No-op. } @@ -252,7 +252,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS cfg.setDiscoverySpi(new TcpDiscoverySpi()); - GridCacheConfiguration ccfg = defaultCacheConfiguration(); + CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.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/GridCacheLuceneQueryIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java index 4f9671b..9eeb9dc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; @@ -65,13 +66,13 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { cfg.setIncludeEventTypes(); cfg.setRestEnabled(false); - GridCacheConfiguration cacheCfg1 = defaultCacheConfiguration(); + CacheConfiguration cacheCfg1 = defaultCacheConfiguration(); cacheCfg1.setName("local1"); cacheCfg1.setCacheMode(LOCAL); cacheCfg1.setWriteSynchronizationMode(FULL_SYNC); - GridCacheConfiguration cacheCfg2 = defaultCacheConfiguration(); + CacheConfiguration cacheCfg2 = defaultCacheConfiguration(); cacheCfg2.setName("local2"); cacheCfg2.setCacheMode(LOCAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java index 26cf81a..847eefd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -18,9 +18,9 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.lru.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -76,7 +76,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); @@ -186,7 +186,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { Ignite g = startGrid(); - GridCacheConfiguration cfg = g.cache(null).configuration(); + CacheConfiguration cfg = g.cache(null).configuration(); assertEquals(memoryMode, cfg.getMemoryMode()); assertEquals(0, cfg.getOffHeapMaxMemory()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java index 2571766..4e7ea63 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMissingCommitVersionSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; @@ -62,7 +63,7 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes cfg.setDiscoverySpi(discoSpi); - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); ccfg.setAtomicityMode(TRANSACTIONAL);
