You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/01/16 13:11:27 UTC
[01/13] incubator-ignite git commit: ignite-42
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-42 4b8ec5f23 -> b0d8a67aa
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java
index 12844f2..4fe19c5 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java
@@ -18,10 +18,9 @@
package org.gridgain.grid.ggfs;
import org.apache.commons.logging.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.ggfs.common.*;
import org.gridgain.grid.kernal.ggfs.hadoop.*;
@@ -88,8 +87,8 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra
*
* @return Cache configuration.
*/
- protected GridCacheConfiguration[] cacheConfiguration() {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration[] cacheConfiguration() {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -101,7 +100,7 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -110,7 +109,7 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra
metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
- return new GridCacheConfiguration[] {metaCacheCfg, cacheCfg};
+ return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
index b2bddd7..1eb4130 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
@@ -21,9 +21,9 @@ import org.apache.hadoop.conf.*;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.ggfs.*;
import org.apache.ignite.spi.communication.tcp.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -206,7 +206,7 @@ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbs
cfg.setCommunicationSpi(commSpi);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -214,7 +214,7 @@ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbs
metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
dataCacheCfg.setName("partitioned");
dataCacheCfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
index fb7008d..a5e96b4 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
@@ -19,6 +19,7 @@ package org.gridgain.grid.ggfs;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.fs.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.gridgain.grid.cache.*;
@@ -101,8 +102,8 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst
*
* @return Cache configuration.
*/
- private GridCacheConfiguration[] cacheConfiguration() {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ private CacheConfiguration[] cacheConfiguration() {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -113,7 +114,7 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -121,7 +122,7 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst
metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
- return new GridCacheConfiguration[] {metaCacheCfg, cacheCfg};
+ return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
index b649bd4..a030640 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
@@ -20,6 +20,7 @@ package org.gridgain.grid.ggfs;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.fs.FileSystem;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.gridgain.grid.cache.*;
@@ -85,7 +86,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA
ggfsCfg.setDefaultMode(PRIMARY);
ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:10500}"));
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -96,7 +97,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
index a673bbd..c9d836f 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
@@ -19,6 +19,7 @@ package org.gridgain.grid.ggfs;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.fs.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -99,7 +100,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo
"ggfs://ggfs-secondary:ggfs-grid-secondary@127.0.0.1:11500/",
"modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml"));
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -110,7 +111,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -158,7 +159,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo
ggfsCfg.setDefaultMode(PRIMARY);
ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:11500}"));
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -169,7 +170,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java
index 785c957..2a26b6c 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java
@@ -20,6 +20,7 @@ package org.gridgain.grid.ggfs;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.fs.*;
import org.apache.hadoop.fs.FileSystem;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -110,8 +111,8 @@ public class GridGgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest {
* @param gridName Grid name.
* @return Cache configuration.
*/
- protected GridCacheConfiguration cacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String gridName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java
index 64eaca9..fa25ade 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal.processors.hadoop;
import org.apache.hadoop.conf.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.fs.*;
import org.apache.ignite.spi.communication.tcp.*;
@@ -142,8 +142,8 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest
/**
* @return GGFS meta cache configuration.
*/
- public GridCacheConfiguration metaCacheConfiguration() {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ public CacheConfiguration metaCacheConfiguration() {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setName(ggfsMetaCacheName);
cfg.setCacheMode(REPLICATED);
@@ -156,8 +156,8 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest
/**
* @return GGFS data cache configuration.
*/
- private GridCacheConfiguration dataCacheConfiguration() {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ private CacheConfiguration dataCacheConfiguration() {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setName(ggfsDataCacheName);
cfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
index a22cd42..cc1e4ff 100644
--- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
+++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
@@ -30,6 +30,7 @@ import org.hibernate.*;
import org.hibernate.cfg.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import javax.cache.integration.*;
import java.io.*;
import java.net.*;
@@ -224,16 +225,19 @@ public class GridCacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void put(K key, @Nullable V val) {
+ @Override public void write(javax.cache.Cache.Entry<? extends K, ? extends V> entry) {
init();
IgniteTx tx = transaction();
+ K key = entry.getKey();
+ V val = entry.getValue();
+
if (log.isDebugEnabled())
log.debug("Store put [key=" + key + ", val=" + val + ", tx=" + tx + ']');
if (val == null) {
- remove(key);
+ delete(key);
return;
}
@@ -241,9 +245,9 @@ public class GridCacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> {
Session ses = session(tx);
try {
- GridCacheHibernateBlobStoreEntry entry = new GridCacheHibernateBlobStoreEntry(toBytes(key), toBytes(val));
+ GridCacheHibernateBlobStoreEntry entry0 = new GridCacheHibernateBlobStoreEntry(toBytes(key), toBytes(val));
- ses.saveOrUpdate(entry);
+ ses.saveOrUpdate(entry0);
}
catch (IgniteCheckedException | HibernateException e) {
rollback(ses, tx);
@@ -257,7 +261,7 @@ public class GridCacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings({"JpaQueryApiInspection", "JpaQlInspection"})
- @Override public void remove(K key) {
+ @Override public void delete(Object key) {
init();
IgniteTx tx = transaction();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
index 3b39f7f..ffdd2ec 100644
--- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.cache.hibernate;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -102,8 +103,8 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac
* @param cacheName Cache name.
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration(String cacheName) {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(String cacheName) {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java
index 862db45..7725e30 100644
--- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.cache.hibernate;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
@@ -409,8 +410,8 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
* @param regionName Region name.
* @return Cache configuration for {@link GeneralDataRegion}.
*/
- private GridCacheConfiguration generalRegionConfiguration(String regionName) {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ private CacheConfiguration generalRegionConfiguration(String regionName) {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setName(regionName);
@@ -431,8 +432,8 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
* @param regionName Region name.
* @return Cache configuration for {@link TransactionalDataRegion}.
*/
- protected GridCacheConfiguration transactionalRegionConfiguration(String regionName) {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ protected CacheConfiguration transactionalRegionConfiguration(String regionName) {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setName(regionName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
index c872e6c..b064393 100644
--- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
+++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java
@@ -19,6 +19,7 @@ package org.gridgain.grid.cache.hibernate;
import org.apache.commons.dbcp.managed.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.jta.*;
import org.h2.jdbcx.*;
@@ -87,8 +88,8 @@ public class GridHibernateL2CacheTransactionalSelfTest extends GridHibernateL2Ca
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration transactionalRegionConfiguration(String regionName) {
- GridCacheConfiguration cfg = super.transactionalRegionConfiguration(regionName);
+ @Override protected CacheConfiguration transactionalRegionConfiguration(String regionName) {
+ CacheConfiguration cfg = super.transactionalRegionConfiguration(regionName);
cfg.setTransactionManagerLookupClassName(TestTmLookup.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java
index 9cd1378..d64ab49 100644
--- a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java
+++ b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java
@@ -18,13 +18,13 @@
package org.gridgain.grid.kernal.processors.query.h2;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.indexing.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
@@ -1121,7 +1121,7 @@ public class GridH2Indexing implements GridQueryIndexing {
if (cfg0 != null)
cfg = cfg0;
- for (GridCacheConfiguration cacheCfg : ctx.config().getCacheConfiguration())
+ for (CacheConfiguration cacheCfg : ctx.config().getCacheConfiguration())
registerSpace(cacheCfg.getName());
}
@@ -1324,7 +1324,7 @@ public class GridH2Indexing implements GridQueryIndexing {
return cfg != null && cfg.isIndexPrimitiveKey();
}
-
+
/**
* @param spaceName Space name.
* @return {@code true} If primitive values must be indexed.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 2e6cb47..6652d73 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.spi.communication.tcp;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -26,7 +27,6 @@ import org.apache.ignite.resources.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.managers.communication.*;
@@ -63,7 +63,7 @@ public class GridOrderedMessageCancelSelfTest 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.setPreloadMode(NONE);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 73a18ea..929feb3 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.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.marshaller.optimized.*;
@@ -84,8 +85,8 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
* @param spiName Indexing SPI name.
* @return Cache.
*/
- protected GridCacheConfiguration cache(@Nullable String name, @Nullable String spiName) {
- GridCacheConfiguration cache = defaultCacheConfiguration();
+ protected CacheConfiguration cache(@Nullable String name, @Nullable String spiName) {
+ CacheConfiguration cache = defaultCacheConfiguration();
cache.setName(name);
cache.setCacheMode(cacheMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 536e3ad..0a00bf5 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.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.*;
@@ -27,7 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
@@ -40,6 +40,7 @@ import org.gridgain.testframework.junits.common.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import javax.cache.expiry.*;
import java.io.*;
import java.util.*;
@@ -116,10 +117,10 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
c.setMarshaller(new IgniteOptimizedMarshaller(false));
- GridCacheConfiguration[] ccs = new GridCacheConfiguration[2];
+ CacheConfiguration[] ccs = new CacheConfiguration[2];
for (int i = 0; i < ccs.length; i++) {
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
if (i > 0)
cc.setName("c" + i);
@@ -2009,12 +2010,12 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
}
/** {@inheritDoc} */
- @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());
}
/** {@inheritDoc} */
- @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/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 405c462..db8b674 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.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.marshaller.optimized.*;
@@ -81,8 +82,8 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
* @param mode Cache mode.
* @return Cache configuration.
*/
- private static GridCacheConfiguration createCache(String name, GridCacheMode mode) {
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ private static CacheConfiguration createCache(String name, GridCacheMode mode) {
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setName(name);
cc.setCacheMode(mode);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
index a443bed..313ab6d 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.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.*;
@@ -121,7 +122,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setSwapEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java
index b41c11d..3118aaf 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.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.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
@@ -34,6 +34,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -61,7 +62,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cache = defaultCacheConfiguration();
+ CacheConfiguration cache = defaultCacheConfiguration();
cache.setCacheMode(REPLICATED);
cache.setStore(new TestStore());
@@ -407,15 +408,16 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Integer key, ValueObject val) {
- assert key != null;
- assert val != null;
+ @Override public void write(Cache.Entry<? extends Integer, ? extends ValueObject> e) {
+ assert e != null;
+ assert e.getKey() != null;
+ assert e.getValue() != null;
- STORE_MAP.put(key, val);
+ STORE_MAP.put(e.getKey(), e.getValue());
}
/** {@inheritDoc} */
- @Override public void remove(Integer key) {
+ @Override public void delete(Object key) {
assert key != null;
STORE_MAP.remove(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java
index bd7c6f1..1b33634 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.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.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -63,7 +64,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(CACHE_MODE);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 95cf0c9..92e37d3 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.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.marshaller.optimized.*;
@@ -84,7 +85,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java
index 57c1cb6..995ab27 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.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.*;
@@ -25,7 +26,6 @@ import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.*;
@@ -91,8 +91,8 @@ public class GridCacheQueryUserResourceSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration() throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
index 1727579..0a1604f 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.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.marshaller.optimized.*;
@@ -61,8 +62,8 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract
}
/** {@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/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
index 95bd439..6e9e604 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.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.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -51,7 +52,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe
c.setDiscoverySpi(disco);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setCacheMode(PARTITIONED);
ccfg.setDistributionMode(PARTITIONED_ONLY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
index f28c27d..25e83f7 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.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.*;
@@ -77,7 +78,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
cfg.setNetworkTimeout(2000);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index 9b244bd..0536667 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.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.*;
@@ -57,7 +58,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest {
c.setSwapSpaceSpi(new NoopSwapSpaceSpi());
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
index 57fa1c9..17cf11d 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.query.*;
@@ -50,8 +51,8 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cache(@Nullable String name, @Nullable String spiName) {
- GridCacheConfiguration cc = super.cache(name, spiName);
+ @Override protected CacheConfiguration cache(@Nullable String name, @Nullable String spiName) {
+ CacheConfiguration cc = super.cache(name, spiName);
cc.setDistributionMode(distributionMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index d5b43cc..b8a4de5 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.dataload.*;
import org.apache.ignite.marshaller.optimized.*;
@@ -80,8 +81,8 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
* @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.setCacheMode(PARTITIONED);
cfg.setStartSize(700000);
cfg.setWriteSynchronizationMode(FULL_ASYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
index 61c2df8..6a702cd 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -71,7 +72,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest
c.setDiscoverySpi(disco);
- 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/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java
index 2b6018f..56bedf5 100644
--- a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java
+++ b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java
@@ -18,7 +18,6 @@
package org.gridgain.grid.cache.jta;
import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.jta.jndi.*;
import org.gridgain.grid.cache.jta.reflect.*;
import org.jetbrains.annotations.*;
@@ -28,7 +27,7 @@ import javax.transaction.*;
/**
* Allows grid to use different transactional systems. Implement this interface
* to look up native transaction manager within your environment. Transaction
- * manager lookup is configured via {@link GridCacheConfiguration#getTransactionManagerLookupClassName()}
+ * manager lookup is configured via {@link org.apache.ignite.cache.CacheConfiguration#getTransactionManagerLookupClassName()}
* method.
* <p>
* The following implementations are provided out of the box:
@@ -46,7 +45,7 @@ public interface GridCacheTmLookup {
/**
* Gets Transaction Manager (TM).
*
- * @return TM or {@code null} if TM cannot be looked up.
+ * @return TM or {@code null} if TM cannot be looked up.
* @throws IgniteCheckedException In case of error.
*/
@Nullable public TransactionManager getTm() throws IgniteCheckedException;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
index c1ced2d..eb71687 100644
--- a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
+++ b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal.processors.cache.jta;
import org.apache.ignite.*;
+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.jta.*;
import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.jetbrains.annotations.*;
@@ -41,7 +41,7 @@ public class GridCacheJtaManager<K, V> extends GridCacheJtaManagerAdapter<K, V>
private GridCacheTmLookup tmLookup;
/** {@inheritDoc} */
- @Override public void createTmLookup(GridCacheConfiguration ccfg) throws IgniteCheckedException {
+ @Override public void createTmLookup(CacheConfiguration ccfg) throws IgniteCheckedException {
assert ccfg.getTransactionManagerLookupClassName() != null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
index fc85588..a6d09d3 100644
--- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
+++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.jta.*;
import org.gridgain.testframework.*;
import org.gridgain.testframework.junits.common.*;
@@ -38,7 +38,7 @@ public class GridCacheJtaConfigurationValidationSelfTest extends GridCommonAbstr
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setAtomicityMode(ATOMIC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java
index 08cf675..81e6961 100644
--- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.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.*;
@@ -64,8 +65,8 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
}
/** {@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.setTransactionManagerLookupClassName(TestTmLookup.class.getName());
@@ -76,9 +77,9 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cfg1 = cacheConfiguration(gridName);
+ CacheConfiguration cfg1 = cacheConfiguration(gridName);
- GridCacheConfiguration cfg2 = cacheConfiguration(gridName);
+ CacheConfiguration cfg2 = cacheConfiguration(gridName);
cfg2.setName("cache-2");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
index 8edb3d9..503aa2d 100644
--- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
+++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.jta.GridCacheTmLookup;
import org.gridgain.grid.kernal.*;
@@ -65,7 +65,7 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa
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/scalar/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/resources/spring-cache.xml b/modules/scalar/src/test/resources/spring-cache.xml
index 895e4f6..04cd98d 100644
--- a/modules/scalar/src/test/resources/spring-cache.xml
+++ b/modules/scalar/src/test/resources/spring-cache.xml
@@ -24,7 +24,7 @@
<property name="localHost" value="127.0.0.1"/>
<property name="cacheConfiguration">
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
<property name="distributionMode" value="NEAR_PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java
index 934447d..462ff04 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.cache.spring;
+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 GridSpringCacheManagerSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cache = new GridCacheConfiguration();
+ CacheConfiguration cache = new CacheConfiguration();
cache.setName(CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
index f0c7e76..2211805 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.p2p;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -93,7 +93,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
if (gridName.contains("testCacheRedeployVersionChangeContinuousMode")) {
- GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setCacheMode(GridCacheMode.REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
index 8f1ba42..2db7db9 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
@@ -17,6 +17,7 @@
package org.gridgain.visor.commands.cache
+import org.apache.ignite.cache.CacheConfiguration
import org.gridgain.grid.cache.GridCacheAtomicityMode._
import org.gridgain.grid.cache.GridCacheMode._
import org.gridgain.grid.cache._
@@ -65,8 +66,8 @@ class VisorCacheClearCommandSpec extends VisorRuntimeBaseSpec(2) {
* @param name Cache name.
* @return Cache Configuration.
*/
- def cacheConfig(@Nullable name: String): GridCacheConfiguration = {
- val cfg = new GridCacheConfiguration
+ def cacheConfig(@Nullable name: String): CacheConfiguration = {
+ val cfg = new CacheConfiguration
cfg.setCacheMode(REPLICATED)
cfg.setAtomicityMode(TRANSACTIONAL)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
index 5f34514..aeece94 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
@@ -17,6 +17,7 @@
package org.gridgain.visor.commands.cache
+import org.apache.ignite.cache.CacheConfiguration
import org.gridgain.grid.cache.GridCacheMode._
import org.gridgain.grid.cache._
@@ -64,8 +65,8 @@ class VisorCacheCompactCommandSpec extends VisorRuntimeBaseSpec(2) {
* @param name Cache name.
* @return Cache Configuration.
*/
- def cacheConfig(@Nullable name: String): GridCacheConfiguration = {
- val cfg = new GridCacheConfiguration
+ def cacheConfig(@Nullable name: String): CacheConfiguration = {
+ val cfg = new CacheConfiguration
cfg.setCacheMode(REPLICATED)
cfg.setName(name)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
index 1c77b52..72c0e12 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
@@ -17,7 +17,8 @@
package org.gridgain.visor.commands.cswap
-import org.gridgain.grid.cache.{GridCacheConfiguration, GridCacheMode}
+import org.apache.ignite.cache.CacheConfiguration
+import org.gridgain.grid.cache.GridCacheMode
import org.apache.ignite.Ignition
import org.apache.ignite.configuration.IgniteConfiguration
@@ -60,8 +61,8 @@ class VisorCacheSwapCommandSpec extends VisorRuntimeBaseSpec(2) {
* @param name Cache name.
* @return Cache Configuration.
*/
- def cacheConfig(@Nullable name: String): GridCacheConfiguration = {
- val cfg = new GridCacheConfiguration
+ def cacheConfig(@Nullable name: String): CacheConfiguration = {
+ val cfg = new CacheConfiguration
cfg.setName(name)
cfg.setCacheMode(GridCacheMode.PARTITIONED)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
index 5a5106f..bf34324 100644
--- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
+++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
-import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.startup.servlet.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -218,7 +217,7 @@ public class GridWebSessionFilter implements Filter {
if (cache == null)
throw new IgniteException("Cache for web sessions is not started (is it configured?): " + cacheName);
- GridCacheConfiguration cacheCfg = cache.getConfiguration(GridCacheConfiguration.class);
+ CacheConfiguration cacheCfg = cache.getConfiguration(CacheConfiguration.class);
if (cacheCfg.getWriteSynchronizationMode() == FULL_ASYNC)
throw new IgniteException("Cache for web sessions cannot be in FULL_ASYNC mode: " + cacheName);
[13/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0d8a67a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0d8a67a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0d8a67a
Branch: refs/heads/ignite-42
Commit: b0d8a67aae4bfd43d36405952253f6d8d64859aa
Parents: 4b8ec5f
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jan 16 11:41:49 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jan 16 15:10:54 2015 +0300
----------------------------------------------------------------------
config/fabric/default-config.xml | 6 +-
config/hadoop/default-config.xml | 8 +-
examples/config/example-cache.xml | 2 +-
examples/config/filesystem/example-ggfs.xml | 4 +-
.../HibernateL2CacheExampleNodeStartup.java | 6 +-
.../store/CacheNodeWithStoreStartup.java | 5 +-
.../store/dummy/CacheDummyPersonStore.java | 9 +-
.../hibernate/CacheHibernatePersonStore.java | 11 +-
.../store/jdbc/CacheJdbcPersonStore.java | 11 +-
.../MemcacheRestExampleNodeStartup.java | 5 +-
...GridClientAbstractMultiThreadedSelfTest.java | 7 +-
.../client/GridClientTopologyCacheSelfTest.java | 4 +-
.../org/gridgain/client/GridHashMapStore.java | 10 +-
.../GridClientAbstractMultiNodeSelfTest.java | 5 +-
.../integration/GridClientAbstractSelfTest.java | 13 +-
.../rest/GridAbstractRestProcessorSelfTest.java | 3 +-
.../rest/GridRestBinaryProtocolSelfTest.java | 6 +-
.../rest/GridRestMemcacheProtocolSelfTest.java | 7 +-
.../rest/GridTaskCommandHandlerSelfTest.java | 7 +-
.../jdbc/GridJdbcComplexQuerySelfTest.java | 3 +-
.../jdbc/GridJdbcConnectionSelfTest.java | 6 +-
.../jdbc/GridJdbcEmptyCacheSelfTest.java | 4 +-
.../jdbc/GridJdbcLocalCachesSelfTest.java | 3 +-
.../gridgain/jdbc/GridJdbcMetadataSelfTest.java | 3 +-
.../jdbc/GridJdbcPreparedStatementSelfTest.java | 3 +-
.../jdbc/GridJdbcResultSetSelfTest.java | 3 +-
.../jdbc/GridJdbcStatementSelfTest.java | 3 +-
.../clients/src/test/resources/spring-cache.xml | 6 +-
.../src/test/resources/spring-server-node.xml | 10 +-
.../test/resources/spring-server-ssl-node.xml | 8 +-
.../java/org/apache/ignite/IgniteCache.java | 6 +-
.../org/apache/ignite/IgniteCacheManager.java | 12 +-
.../java/org/apache/ignite/IgnitePortables.java | 2 +-
.../org/apache/ignite/IgniteTransactions.java | 2 +-
.../apache/ignite/cache/CacheConfiguration.java | 1702 ++++++++++++++++-
.../java/org/apache/ignite/cache/CacheFlag.java | 2 +-
.../apache/ignite/cache/store/CacheStore.java | 6 +-
.../cache/store/CacheStoreBalancingWrapper.java | 10 +-
.../ignite/cache/store/CacheStoreSession.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 8 +-
.../configuration/IgniteConfiguration.java | 10 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../resources/IgniteCacheNameResource.java | 7 +-
.../apache/ignite/transactions/IgniteTx.java | 5 +-
.../gridgain/grid/GridBasicWarmupClosure.java | 15 +-
.../java/org/gridgain/grid/cache/GridCache.java | 9 +-
.../grid/cache/GridCacheAtomicityMode.java | 2 +-
.../grid/cache/GridCacheConfiguration.java | 1721 ------------------
.../grid/cache/GridCacheDistributionMode.java | 6 +-
.../org/gridgain/grid/cache/GridCacheFlag.java | 4 +-
.../grid/cache/GridCacheInterceptor.java | 2 +-
.../org/gridgain/grid/cache/GridCacheMBean.java | 2 +-
.../org/gridgain/grid/cache/GridCacheMode.java | 4 +-
.../grid/cache/GridCachePreloadMode.java | 4 +-
.../grid/cache/GridCacheProjection.java | 14 +-
.../GridCacheWriteSynchronizationMode.java | 2 +-
.../grid/cache/affinity/GridCacheAffinity.java | 37 +-
.../affinity/GridCacheAffinityFunction.java | 2 +-
.../affinity/GridCacheAffinityKeyMapper.java | 4 +-
...GridCacheConsistentHashAffinityFunction.java | 3 +-
.../fair/GridCachePartitionFairAffinity.java | 3 +-
.../GridCacheRendezvousAffinityFunction.java | 4 +-
.../grid/cache/cloner/GridCacheCloner.java | 6 +-
.../cache/eviction/GridCacheEvictionFilter.java | 2 +-
.../fifo/GridCacheFifoEvictionPolicy.java | 4 +-
.../lru/GridCacheLruEvictionPolicy.java | 3 +-
.../random/GridCacheRandomEvictionPolicy.java | 4 +-
.../org/gridgain/grid/kernal/GridGainEx.java | 28 +-
.../org/gridgain/grid/kernal/GridKernal.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 5 +-
.../processors/cache/GridCacheAttributes.java | 5 +-
.../processors/cache/GridCacheContext.java | 7 +-
.../GridCacheDefaultAffinityKeyMapper.java | 4 +-
.../cache/GridCacheEvictionManager.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 41 +-
.../processors/cache/GridCacheProxyImpl.java | 3 +-
.../processors/cache/GridCacheStoreManager.java | 33 +-
.../processors/cache/GridCacheTtlManager.java | 3 +-
.../kernal/processors/cache/GridCacheUtils.java | 17 +-
.../cache/GridCacheWriteBehindStore.java | 152 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../cache/jta/GridCacheJtaManagerAdapter.java | 4 +-
.../cache/jta/GridCacheNoopJtaManager.java | 4 +-
.../cache/transactions/IgniteTxEx.java | 8 +-
.../cache/transactions/IgniteTxProxyImpl.java | 72 -
.../dataload/GridDataLoadCacheUpdaters.java | 3 +-
.../dr/GridDrDataLoadCacheUpdater.java | 5 +-
.../kernal/processors/ggfs/GridGgfsHelper.java | 6 +-
.../processors/ggfs/GridGgfsHelperImpl.java | 6 +-
.../kernal/processors/ggfs/GridGgfsImpl.java | 5 +-
.../processors/ggfs/GridGgfsProcessor.java | 10 +-
.../processors/ggfs/GridNoopGgfsHelper.java | 6 +-
.../processors/query/GridQueryProcessor.java | 8 +-
.../grid/kernal/visor/cache/VisorCache.java | 4 +-
.../cache/VisorCacheAffinityConfiguration.java | 4 +-
.../visor/cache/VisorCacheConfiguration.java | 7 +-
.../cache/VisorCacheDefaultConfiguration.java | 4 +-
.../visor/cache/VisorCacheDgcConfiguration.java | 4 +-
.../cache/VisorCacheEvictionConfiguration.java | 4 +-
.../cache/VisorCacheNearConfiguration.java | 4 +-
.../cache/VisorCachePreloadConfiguration.java | 3 +-
.../cache/VisorCacheStoreConfiguration.java | 4 +-
.../VisorCacheWriteBehindConfiguration.java | 4 +-
.../spring-cache-client-benchmark-1.xml | 2 +-
.../spring-cache-client-benchmark-2.xml | 2 +-
.../spring-cache-client-benchmark-3.xml | 2 +-
.../core/src/test/config/discovery-stress.xml | 2 +-
modules/core/src/test/config/example-cache.xml | 2 +-
modules/core/src/test/config/ggfs-loopback.xml | 4 +-
.../core/src/test/config/ggfs-no-endpoint.xml | 4 +-
modules/core/src/test/config/ggfs-shmem.xml | 4 +-
.../src/test/config/load/cache-benchmark.xml | 4 +-
.../test/config/load/cache-client-benchmark.xml | 4 +-
.../config/load/dsi-49-server-production.xml | 4 +-
.../src/test/config/load/dsi-load-client.xml | 4 +-
.../src/test/config/load/dsi-load-server.xml | 4 +-
.../test/config/load/mongo-multinode-foster.xml | 4 +-
.../core/src/test/config/spring-cache-load.xml | 2 +-
.../config/spring-cache-put-remove-load.xml | 2 +-
.../core/src/test/config/spring-cache-swap.xml | 2 +-
.../src/test/config/spring-cache-teststore.xml | 2 +-
.../core/src/test/config/spring-multicache.xml | 16 +-
.../test/config/websession/spring-cache-1.xml | 6 +-
.../test/config/websession/spring-cache-2.xml | 6 +-
.../test/config/websession/spring-cache-3.xml | 6 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 3 +-
.../cache/IgniteCacheAbstractTest.java | 14 +-
.../cache/IgniteCachingProviderSelfTest.java | 9 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 5 +-
...idCacheCheckpointSpiSecondCacheSelfTest.java | 5 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 5 +-
.../GridCacheStoreValueBytesNode.java | 4 +-
.../grid/GridCacheAffinityBackupsSelfTest.java | 3 +-
...CachePartitionFairAffinityNodesSelfTest.java | 7 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 7 +-
.../ggfs/GridGgfsEventsAbstractSelfTest.java | 11 +-
.../GridGgfsFragmentizerAbstractSelfTest.java | 9 +-
.../grid/kernal/GridAffinityMappedTest.java | 5 +-
.../grid/kernal/GridAffinityP2PSelfTest.java | 4 +-
.../grid/kernal/GridAffinitySelfTest.java | 11 +-
.../grid/kernal/GridDiscoverySelfTest.java | 3 +-
.../kernal/GridJobMasterLeaveAwareSelfTest.java | 4 +-
.../grid/kernal/GridMultipleJobsSelfTest.java | 5 +-
.../kernal/GridProjectionForCachesSelfTest.java | 6 +-
...ectionLocalJobMultipleArgumentsSelfTest.java | 4 +-
.../grid/kernal/GridStartStopSelfTest.java | 6 +-
.../GridCheckpointManagerAbstractSelfTest.java | 4 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 7 +-
.../GridDeploymentMessageCountSelfTest.java | 3 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 5 +-
.../GridAffinityProcessorAbstractSelfTest.java | 3 +-
.../GridCacheAbstractFailoverSelfTest.java | 5 +-
.../cache/GridCacheAbstractFlagsTest.java | 5 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 5 +-
.../GridCacheAbstractProjectionSelfTest.java | 5 +-
.../cache/GridCacheAbstractSelfTest.java | 14 +-
.../cache/GridCacheAbstractTxReadTest.java | 5 +-
.../cache/GridCacheAffinityApiSelfTest.java | 5 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 6 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 6 +-
.../GridCacheAtomicMessageCountSelfTest.java | 3 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 7 +-
...acheBasicStoreMultithreadedAbstractTest.java | 10 +-
.../cache/GridCacheClearAllSelfTest.java | 9 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 3 +-
.../cache/GridCacheConcurrentMapTest.java | 3 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 3 +-
...idCacheConfigurationConsistencySelfTest.java | 168 +-
...ridCacheConfigurationValidationSelfTest.java | 6 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 3 +-
.../GridCacheDeploymentOffHeapSelfTest.java | 6 +-
.../cache/GridCacheDeploymentSelfTest.java | 5 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 3 +-
.../cache/GridCacheEntryVersionSelfTest.java | 3 +-
.../GridCacheEvictionEventAbstractTest.java | 3 +-
.../GridCacheFieldsQueryNoDataSelfTest.java | 4 +-
.../GridCacheFinishPartitionsSelfTest.java | 3 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 5 +-
...idCacheGetAndTransformStoreAbstractTest.java | 3 +-
.../cache/GridCacheGlobalClearAllSelfTest.java | 3 +-
.../GridCacheGroupLockAbstractSelfTest.java | 15 +-
.../GridCacheGroupLockFailoverSelfTest.java | 3 +-
.../cache/GridCacheIncrementTransformTest.java | 3 +-
.../GridCacheInterceptorAbstractSelfTest.java | 5 +-
.../cache/GridCacheIteratorPerformanceTest.java | 5 +-
.../cache/GridCacheKeyCheckSelfTest.java | 5 +-
.../processors/cache/GridCacheLeakTest.java | 5 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 8 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 5 +-
.../cache/GridCacheMemoryModeSelfTest.java | 6 +-
.../GridCacheMissingCommitVersionSelfTest.java | 3 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 5 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 5 +-
...inodeUpdateNearEnabledNoBackupsSelfTest.java | 6 +-
.../cache/GridCacheMvccFlagsTest.java | 4 +-
.../cache/GridCacheMvccManagerSelfTest.java | 5 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 4 +-
.../processors/cache/GridCacheMvccSelfTest.java | 4 +-
.../cache/GridCacheObjectToStringSelfTest.java | 3 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 5 +-
.../cache/GridCacheOffHeapSelfTest.java | 3 +-
.../processors/cache/GridCacheOffHeapTest.java | 3 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 6 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 5 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 3 +-
.../GridCacheOrderedPreloadingSelfTest.java | 5 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 6 +-
.../cache/GridCachePartitionedGetSelfTest.java | 5 +-
...hePartitionedProjectionAffinitySelfTest.java | 3 +-
.../cache/GridCachePartitionedWritesTest.java | 11 +-
.../GridCachePreloadingEvictionsSelfTest.java | 3 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 3 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 5 +-
.../GridCacheQueryInternalKeysSelfTest.java | 5 +-
.../GridCacheReferenceCleanupSelfTest.java | 3 +-
.../cache/GridCacheReloadSelfTest.java | 10 +-
...ridCacheReplicatedSynchronousCommitTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 3 +-
.../cache/GridCacheSlowTxWarnTest.java | 7 +-
.../processors/cache/GridCacheStopSelfTest.java | 3 +-
.../cache/GridCacheStorePutxSelfTest.java | 5 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 5 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 3 +-
.../cache/GridCacheSwapReloadSelfTest.java | 14 +-
.../cache/GridCacheTtlManagerSelfTest.java | 4 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 5 +-
...idCacheValueConsistencyAbstractSelfTest.java | 5 +-
.../GridCacheVariableTopologySelfTest.java | 3 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 8 +-
.../GridCacheWriteBehindStoreAbstractTest.java | 3 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 3 +-
.../GridCacheWriteBehindStoreSelfTest.java | 22 +-
.../IgniteTxExceptionAbstractSelfTest.java | 6 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 3 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 5 +-
...eAbstractDataStructuresFailoverSelfTest.java | 6 +-
...actQueueFailoverDataConsistencySelfTest.java | 5 +-
.../GridCacheAtomicLongApiSelfTest.java | 7 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 5 +-
.../GridCacheCountDownLatchSelfTest.java | 8 +-
.../GridCacheQueueCleanupSelfTest.java | 5 +-
...dCacheQueueMultiNodeConsistencySelfTest.java | 3 +-
.../GridCacheSetAbstractSelfTest.java | 9 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
.../GridCacheLocalAtomicQueueApiSelfTest.java | 4 +-
.../local/GridCacheLocalQueueApiSelfTest.java | 4 +-
.../GridCacheLocalSequenceApiSelfTest.java | 4 +-
...dCachePartitionedAtomicQueueApiSelfTest.java | 4 +-
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 +-
...PartitionedAtomicQueueMultiNodeSelfTest.java | 4 +-
...itionedAtomicQueueRotativeMultiNodeTest.java | 4 +-
...hePartitionedAtomicReferenceApiSelfTest.java | 4 +-
...PartitionedAtomicReferenceMultiNodeTest.java | 4 +-
...titionedAtomicSequenceMultiThreadedTest.java | 3 +-
.../GridCachePartitionedAtomicSetSelfTest.java | 5 +-
...achePartitionedAtomicStampedApiSelfTest.java | 4 +-
...GridCachePartitionedNodeRestartSelfTest.java | 4 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 4 +-
.../GridCachePartitionedQueueApiSelfTest.java | 4 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 5 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 5 +-
...CachePartitionedQueueJoinedNodeSelfTest.java | 4 +-
...dCachePartitionedQueueMultiNodeSelfTest.java | 4 +-
...hePartitionedQueueRotativeMultiNodeTest.java | 4 +-
...GridCachePartitionedSequenceApiSelfTest.java | 4 +-
...chePartitionedSequenceMultiNodeSelfTest.java | 4 +-
...cheReplicatedAtomicReferenceApiSelfTest.java | 4 +-
...eReplicatedAtomicReferenceMultiNodeTest.java | 4 +-
...CacheReplicatedAtomicStampedApiSelfTest.java | 4 +-
.../GridCacheReplicatedQueueApiSelfTest.java | 4 +-
...idCacheReplicatedQueueMultiNodeSelfTest.java | 4 +-
...cheReplicatedQueueRotativeMultiNodeTest.java | 4 +-
.../GridCacheReplicatedSequenceApiSelfTest.java | 4 +-
...acheReplicatedSequenceMultiNodeSelfTest.java | 4 +-
...tractDistributedByteArrayValuesSelfTest.java | 19 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 2 +-
...tractPartitionedByteArrayValuesSelfTest.java | 13 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 3 +-
.../GridCacheAtomicTimeoutSelfTest.java | 4 +-
.../GridCacheClientModesAbstractSelfTest.java | 5 +-
...acheEntrySetIterationPreloadingSelfTest.java | 5 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 5 +-
.../distributed/GridCacheLockAbstractTest.java | 5 +-
.../distributed/GridCacheMixedModeSelfTest.java | 5 +-
...dCacheMultithreadedFailoverAbstractTest.java | 3 +-
...dCachePartitionedAffinityFilterSelfTest.java | 3 +-
...chePartitionedReloadAllAbstractSelfTest.java | 10 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 5 +-
...GridCachePreloadRestartAbstractSelfTest.java | 5 +-
.../GridCacheTransformEventSelfTest.java | 3 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 5 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 5 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 5 +-
.../IgniteTxPreloadAbstractTest.java | 5 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 7 +-
...heAbstractTransformWriteThroughSelfTest.java | 4 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 5 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 3 +-
.../dht/GridCacheColocatedDebugTest.java | 3 +-
...eColocatedOptimisticTransactionSelfTest.java | 3 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 3 +-
.../GridCacheDhtAtomicRemoveFailureTest.java | 6 +-
.../dht/GridCacheDhtEntrySelfTest.java | 3 +-
.../dht/GridCacheDhtEntrySetSelfTest.java | 6 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 3 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtMappingSelfTest.java | 3 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 3 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 4 +-
.../GridCacheDhtPreloadMessageCountTest.java | 3 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 3 +-
.../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 3 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 8 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 8 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 6 +-
.../dht/GridCacheDhtRemoveFailureTest.java | 5 +-
.../dht/GridCacheDhtTxPreloadSelfTest.java | 5 +-
.../dht/GridCacheGlobalLoadTest.java | 5 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 5 +-
...idCachePartitionedPreloadEventsSelfTest.java | 5 +-
...dCachePartitionedTopologyChangeSelfTest.java | 3 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 5 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 5 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 3 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 5 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 5 +-
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 5 +-
.../GridCacheAtomicNearRemoveFailureTest.java | 5 +-
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 5 +-
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 5 +-
...idCacheAtomicPartitionedMetricsSelfTest.java | 6 +-
...cPrimaryWriteOrderNearRemoveFailureTest.java | 5 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 9 +-
.../near/GridCacheNearEvictionSelfTest.java | 3 +-
.../near/GridCacheNearJobExecutionSelfTest.java | 3 +-
.../near/GridCacheNearMetricsSelfTest.java | 5 +-
.../near/GridCacheNearMultiGetSelfTest.java | 3 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 10 +-
.../near/GridCacheNearOneNodeSelfTest.java | 12 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 3 +-
.../GridCacheNearPartitionedClearSelfTest.java | 3 +-
.../GridCacheNearReaderPreloadSelfTest.java | 4 +-
.../near/GridCacheNearReadersSelfTest.java | 3 +-
.../near/GridCacheNearRemoveFailureTest.java | 6 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 3 +-
.../near/GridCacheNearTxPreloadSelfTest.java | 5 +-
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 4 +-
.../near/GridCachePartitionedBasicApiTest.java | 4 +-
.../GridCachePartitionedBasicOpSelfTest.java | 3 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 3 +-
.../near/GridCachePartitionedEventSelfTest.java | 6 +-
.../GridCachePartitionedEvictionSelfTest.java | 4 +-
...titionedExplicitLockNodeFailureSelfTest.java | 3 +-
...GridCachePartitionedFilteredPutSelfTest.java | 5 +-
.../GridCachePartitionedFullApiSelfTest.java | 5 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 10 +-
.../near/GridCachePartitionedLockSelfTest.java | 4 +-
.../GridCachePartitionedMetricsSelfTest.java | 6 +-
...achePartitionedMultiNodeCounterSelfTest.java | 3 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 5 +-
...idCachePartitionedMultiNodeLockSelfTest.java | 4 +-
.../GridCachePartitionedMultiNodeSelfTest.java | 3 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 3 +-
.../near/GridCachePartitionedNestedTxTest.java | 4 +-
...GridCachePartitionedNodeFailureSelfTest.java | 3 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 5 +-
.../GridCachePartitionedProjectionSelfTest.java | 5 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 3 +-
.../GridCachePartitionedStorePutSelfTest.java | 13 +-
...GridCachePartitionedTxConcurrentGetTest.java | 4 +-
...GridCachePartitionedTxMultiNodeSelfTest.java | 4 +-
...CachePartitionedTxMultiThreadedSelfTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 3 +-
...achePartitionedTxSingleThreadedSelfTest.java | 3 +-
.../GridCachePartitionedTxTimeoutSelfTest.java | 4 +-
.../near/GridCachePutArrayValueSelfTest.java | 5 +-
...idCacheRendezvousAffinityClientSelfTest.java | 3 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 13 +-
...stractReplicatedByteArrayValuesSelfTest.java | 14 +-
...ridCacheAtomicReplicatedMetricsSelfTest.java | 6 +-
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 5 +-
.../GridCacheReplicatedBasicApiTest.java | 4 +-
.../GridCacheReplicatedBasicOpSelfTest.java | 4 +-
.../GridCacheReplicatedClientOnlySelfTest.java | 5 +-
.../GridCacheReplicatedEvictionSelfTest.java | 5 +-
.../GridCacheReplicatedFullApiSelfTest.java | 5 +-
.../GridCacheReplicatedInvalidateSelfTest.java | 3 +-
.../GridCacheReplicatedJobExecutionTest.java | 3 +-
.../GridCacheReplicatedMarshallerTxTest.java | 4 +-
.../GridCacheReplicatedMetricsSelfTest.java | 6 +-
...ridCacheReplicatedMultiNodeLockSelfTest.java | 4 +-
.../GridCacheReplicatedMultiNodeSelfTest.java | 4 +-
.../GridCacheReplicatedNearOnlySelfTest.java | 5 +-
.../GridCacheReplicatedNodeFailureSelfTest.java | 4 +-
.../GridCacheReplicatedNodeRestartSelfTest.java | 4 +-
...dezvousAffinityMultiNodeFullApiSelfTest.java | 6 +-
.../GridCacheReplicatedTxConcurrentGetTest.java | 4 +-
...GridCacheReplicatedTxMultiNodeBasicTest.java | 4 +-
...dCacheReplicatedTxMultiThreadedSelfTest.java | 4 +-
...CacheReplicatedTxSingleThreadedSelfTest.java | 4 +-
.../GridCacheReplicatedTxTimeoutSelfTest.java | 4 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 5 +-
...idCacheReplicatedPreloadOffHeapSelfTest.java | 7 +-
.../GridCacheReplicatedPreloadSelfTest.java | 5 +-
...eplicatedPreloadStartStopEventsSelfTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 11 +-
...heConcurrentEvictionConsistencySelfTest.java | 3 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 3 +-
.../GridCacheDistributedEvictionsSelfTest.java | 3 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 10 +-
.../eviction/GridCacheEvictionAbstractTest.java | 3 +-
.../GridCacheEvictionFilterSelfTest.java | 3 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 3 +-
.../GridCacheEvictionTouchSelfTest.java | 4 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 5 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 3 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 3 +-
.../GridCacheAtomicLocalMetricsSelfTest.java | 6 +-
.../local/GridCacheLocalBasicApiSelfTest.java | 4 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 5 +-
.../local/GridCacheLocalFullApiSelfTest.java | 5 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 19 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 4 +-
.../local/GridCacheLocalMetricsSelfTest.java | 6 +-
.../GridCacheLocalMultithreadedSelfTest.java | 3 +-
.../GridCacheLocalTxMultiThreadedSelfTest.java | 4 +-
.../GridCacheLocalTxSingleThreadedSelfTest.java | 4 +-
.../local/GridCacheLocalTxTimeoutSelfTest.java | 3 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 5 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 10 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 5 +-
.../dataload/GridDataLoaderImplSelfTest.java | 5 +-
.../dataload/GridDataLoaderPerformanceTest.java | 4 +-
.../GridDataLoaderProcessorSelfTest.java | 3 +-
...heGgfsPerBlockLruEvictionPolicySelfTest.java | 9 +-
.../ggfs/GridGgfsAbstractSelfTest.java | 5 +-
.../processors/ggfs/GridGgfsCacheSelfTest.java | 5 +-
.../ggfs/GridGgfsDataManagerSelfTest.java | 5 +-
.../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +-
.../ggfs/GridGgfsMetricsSelfTest.java | 9 +-
.../processors/ggfs/GridGgfsModesSelfTest.java | 9 +-
.../ggfs/GridGgfsProcessorSelfTest.java | 6 +-
.../GridGgfsProcessorValidationSelfTest.java | 78 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 5 +-
.../processors/ggfs/GridGgfsSizeSelfTest.java | 5 +-
.../ggfs/GridGgfsStreamsSelfTest.java | 6 +-
.../processors/ggfs/GridGgfsTaskSelfTest.java | 6 +-
.../GridGgfsAbstractRecordResolverSelfTest.java | 6 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 3 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
.../gridgain/grid/lang/GridFuncSelfTest.java | 4 +-
.../marshaller/GridMarshallerAbstractTest.java | 6 +-
.../GridP2PContinuousDeploymentSelfTest.java | 6 +-
.../session/GridSessionCheckpointSelfTest.java | 4 +-
.../util/future/GridEmbeddedFutureSelfTest.java | 2 +-
.../shmem/GridIpcSharedMemoryNodeStartup.java | 4 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 4 +-
...ridCacheAffinityTransactionsOffHeapTest.java | 3 +-
.../cache/GridCachePutRemoveLoadTest.java | 3 +-
.../cache/GridCacheSingleNodeLoadTest.java | 3 +-
.../GridCacheWriteBehindStoreLoadTest.java | 10 +-
.../capacity/spring-capacity-cache.xml | 2 +-
.../colocation/GridTestCacheStore.java | 5 +-
.../loadtests/colocation/spring-colocation.xml | 2 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 3 +-
.../swap/GridSwapEvictAllBenchmark.java | 9 +-
.../testframework/junits/GridAbstractTest.java | 7 +-
.../cache/GridAbstractCacheStoreSelfTest.java | 123 +-
.../junits/cache/TestCacheSession.java | 5 +-
.../cache/TestThreadLocalCacheSession.java | 5 +-
.../junits/common/GridCommonAbstractTest.java | 9 +-
.../core/src/test/webapp/META-INF/gg-config.xml | 8 +-
...dGgfsHadoop20FileSystemAbstractSelfTest.java | 14 +-
.../GridGgfsHadoopDualAbstractSelfTest.java | 5 +-
...ridGgfsHadoopFileSystemAbstractSelfTest.java | 13 +-
.../GridGgfsHadoopFileSystemClientSelfTest.java | 11 +-
...idGgfsHadoopFileSystemHandshakeSelfTest.java | 6 +-
...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 9 +-
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 5 +-
...fsHadoopFileSystemSecondaryModeSelfTest.java | 9 +-
.../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java | 5 +-
.../hadoop/GridHadoopAbstractSelfTest.java | 10 +-
.../hibernate/GridCacheHibernateBlobStore.java | 14 +-
...idHibernateL2CacheConfigurationSelfTest.java | 5 +-
.../hibernate/GridHibernateL2CacheSelfTest.java | 9 +-
...idHibernateL2CacheTransactionalSelfTest.java | 5 +-
.../processors/query/h2/GridH2Indexing.java | 6 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 4 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 5 +-
.../cache/GridCacheAbstractQuerySelfTest.java | 13 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 5 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 3 +-
.../cache/GridCacheQueryLoadSelfTest.java | 16 +-
.../cache/GridCacheQueryMetricsSelfTest.java | 3 +-
.../GridCacheQueryMultiThreadedSelfTest.java | 3 +-
.../GridCacheQueryUserResourceSelfTest.java | 6 +-
...idCacheReduceQueryMultithreadedSelfTest.java | 5 +-
.../GridCacheSqlQueryMultiThreadedSelfTest.java | 3 +-
.../processors/cache/GridCacheSwapSelfTest.java | 3 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 3 +-
...GridCachePartitionedFieldsQuerySelfTest.java | 5 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 5 +-
.../near/GridCacheQueryNodeRestartSelfTest.java | 3 +-
.../grid/cache/jta/GridCacheTmLookup.java | 5 +-
.../cache/jta/GridCacheJtaManager.java | 4 +-
...CacheJtaConfigurationValidationSelfTest.java | 4 +-
.../processors/cache/GridCacheJtaSelfTest.java | 9 +-
.../GridTmLookupLifecycleAwareSelfTest.java | 4 +-
.../scalar/src/test/resources/spring-cache.xml | 2 +-
.../spring/GridSpringCacheManagerSelfTest.java | 3 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +-
.../cache/VisorCacheClearCommandSpec.scala | 5 +-
.../cache/VisorCacheCompactCommandSpec.scala | 5 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 7 +-
.../cache/websession/GridWebSessionFilter.java | 3 +-
530 files changed, 3509 insertions(+), 3332 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/config/fabric/default-config.xml
----------------------------------------------------------------------
diff --git a/config/fabric/default-config.xml b/config/fabric/default-config.xml
index c74adde..eb8ca17 100644
--- a/config/fabric/default-config.xml
+++ b/config/fabric/default-config.xml
@@ -40,7 +40,7 @@
<!--
Local cache configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.GridCacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
</bean>
@@ -48,7 +48,7 @@
<!--
Replicated cache configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.GridCacheConfiguration">
<property name="name" value="replicated"/>
<property name="cacheMode" value="REPLICATED"/>
</bean>
@@ -56,7 +56,7 @@
<!--
Partitioned cache configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.GridCacheConfiguration">
<property name="name" value="local"/>
<property name="cacheMode" value="LOCAL"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/config/hadoop/default-config.xml
----------------------------------------------------------------------
diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml
index 732e0ca..cb51ff1 100644
--- a/config/hadoop/default-config.xml
+++ b/config/hadoop/default-config.xml
@@ -64,7 +64,7 @@
<!--
Abstract cache configuration for GGFS file data to be used as a template.
-->
- <bean id="dataCacheCfgBase" class="org.gridgain.grid.cache.GridCacheConfiguration" abstract="true">
+ <bean id="dataCacheCfgBase" class="org.apache.ignite.cache.GridCacheConfiguration" abstract="true">
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
@@ -80,7 +80,7 @@
<!--
Abstract cache configuration for GGFS metadata to be used as a template.
-->
- <bean id="metaCacheCfgBase" class="org.gridgain.grid.cache.GridCacheConfiguration" abstract="true">
+ <bean id="metaCacheCfgBase" class="org.apache.ignite.cache.GridCacheConfiguration" abstract="true">
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
@@ -135,12 +135,12 @@
<property name="cacheConfiguration">
<list>
<!-- File system metadata cache. -->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration" parent="metaCacheCfgBase">
+ <bean class="org.apache.ignite.cache.GridCacheConfiguration" parent="metaCacheCfgBase">
<property name="name" value="ggfs-meta"/>
</bean>
<!-- File system files data cache. -->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration" parent="dataCacheCfgBase">
+ <bean class="org.apache.ignite.cache.GridCacheConfiguration" parent="dataCacheCfgBase">
<property name="name" value="ggfs-data"/>
</bean>
</list>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index 397c2cf..e4e513c 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -129,7 +129,7 @@
</bean>
<!-- Template for all example cache configurations. -->
- <bean id="cache-template" abstract="true" class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean id="cache-template" abstract="true" class="org.apache.ignite.cache.CacheConfiguration">
<!-- Initial cache size. -->
<property name="startSize" value="3000000"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/config/filesystem/example-ggfs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml
index 4e0a23d..fb7e11a 100644
--- a/examples/config/filesystem/example-ggfs.xml
+++ b/examples/config/filesystem/example-ggfs.xml
@@ -116,7 +116,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-data"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
@@ -132,7 +132,7 @@
</property>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-meta"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
index e85a20a..1a23d72 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
@@ -18,8 +18,8 @@
package org.gridgain.examples.datagrid.hibernate;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -85,8 +85,8 @@ public class HibernateL2CacheExampleNodeStartup {
* @param atomicityMode Atomicity mode.
* @return Cache configuration.
*/
- private static GridCacheConfiguration cacheConfiguration(String name, GridCacheAtomicityMode atomicityMode) {
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ private static CacheConfiguration cacheConfiguration(String name, GridCacheAtomicityMode atomicityMode) {
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(name);
ccfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java
index fdf911b..6b77a14 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java
@@ -18,10 +18,9 @@
package org.gridgain.examples.datagrid.store;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.examples.datagrid.store.dummy.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -64,7 +63,7 @@ public class CacheNodeWithStoreStartup {
discoSpi.setIpFinder(ipFinder);
- GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration();
// Set atomicity as transaction, since we are showing transactions in example.
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java
index f4b6553..59ccb23 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java
@@ -24,8 +24,8 @@ import org.apache.ignite.resources.*;
import org.apache.ignite.transactions.*;
import org.gridgain.examples.datagrid.store.*;
import org.gridgain.grid.cache.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
@@ -54,16 +54,19 @@ public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> {
}
/** {@inheritDoc} */
- @Override public void put(Long key, Person val) {
+ @Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) {
IgniteTx tx = transaction();
+ Long key = entry.getKey();
+ Person val = entry.getValue();
+
System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']');
dummyDB.put(key, val);
}
/** {@inheritDoc} */
- @Override public void remove(Long key) {
+ @Override public void delete(Object key) {
IgniteTx tx = transaction();
System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index c671108..a6ad96c 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -25,6 +25,7 @@ import org.hibernate.*;
import org.hibernate.cfg.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import javax.cache.integration.*;
import java.util.*;
@@ -71,13 +72,17 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> {
}
/** {@inheritDoc} */
- @Override public void put(Long key, @Nullable Person val) {
+ @Override public void write(javax.cache.Cache.Entry<? extends Long, ? extends Person> entry) {
IgniteTx tx = transaction();
+ Long key = entry.getKey();
+
+ Person val = entry.getValue();
+
System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']');
if (val == null) {
- remove(key);
+ delete(key);
return;
}
@@ -99,7 +104,7 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> {
/** {@inheritDoc} */
@SuppressWarnings({"JpaQueryApiInspection"})
- @Override public void remove(Long key) {
+ @Override public void delete(Object key) {
IgniteTx tx = transaction();
System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index 2711dba..93b2c3d 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -24,6 +24,7 @@ import org.apache.ignite.transactions.*;
import org.gridgain.examples.datagrid.store.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import javax.cache.integration.*;
import java.sql.*;
import java.util.*;
@@ -116,9 +117,13 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
}
/** {@inheritDoc} */
- @Override public void put(Long key, Person val) {
+ @Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) {
IgniteTx tx = transaction();
+ Long key = entry.getKey();
+
+ Person val = entry.getValue();
+
System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']');
Connection conn = null;
@@ -158,7 +163,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
}
/** {@inheritDoc} */
- @Override public void remove(Long key) {
+ @Override public void delete(Object key) {
IgniteTx tx = transaction();
System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
@@ -169,7 +174,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
conn = connection(tx);
try (PreparedStatement st = conn.prepareStatement("delete from PERSONS where id=?")) {
- st.setLong(1, key);
+ st.setLong(1, (Long)key);
st.executeUpdate();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index 2e5635f..06f435a 100644
--- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -18,10 +18,9 @@
package org.gridgain.examples.misc.client.memcache;
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.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.gridgain.grid.cache.query.*;
@@ -69,7 +68,7 @@ public class MemcacheRestExampleNodeStartup {
cfg.setMarshaller(marsh);
- GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java
index dfa8a5b..f6d5091 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.client;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -26,8 +27,6 @@ import org.apache.ignite.resources.*;
import org.gridgain.client.balancer.*;
import org.gridgain.client.impl.*;
import org.gridgain.client.ssl.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.affinity.*;
@@ -193,8 +192,8 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setDistributionMode(NEAR_PARTITIONED);
cfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java
index 708924c..68e4bbe 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.client;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-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.*;
@@ -258,7 +258,7 @@ public class GridClientTopologyCacheSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(LOCAL);
cacheCfg.setName(CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java b/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java
index 5b0fbe7..a585e60 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridHashMapStore.java
@@ -17,12 +17,10 @@
package org.gridgain.client;
-import org.apache.ignite.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
/**
@@ -44,12 +42,12 @@ public class GridHashMapStore extends CacheStoreAdapter {
}
/** {@inheritDoc} */
- @Override public void put(Object key, @Nullable Object val) {
- map.put(key, val);
+ @Override public void write(Cache.Entry e) {
+ map.put(e.getKey(), e.getValue());
}
/** {@inheritDoc} */
- @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/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
index 90fbb5c..34d5581 100644
--- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.client.integration;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -196,8 +197,8 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java
index 6e8d1a3..2fc2b88 100644
--- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java
@@ -20,6 +20,7 @@ package org.gridgain.client.integration;
import junit.framework.*;
import net.sf.json.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -28,7 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.client.*;
import org.gridgain.client.ssl.*;
import org.gridgain.grid.cache.*;
@@ -38,6 +38,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.io.*;
import java.util.*;
import java.util.concurrent.*;
@@ -247,8 +248,8 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(cacheName == null || CACHE_NAME.equals(cacheName) ? LOCAL : "replicated".equals(cacheName) ?
REPLICATED : PARTITIONED);
@@ -1581,12 +1582,12 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @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());
}
/** {@inheritDoc} */
- @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/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
index 3f9c238..872e5cb 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.rest;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -79,7 +80,7 @@ abstract class GridAbstractRestProcessorSelfTest extends GridCommonAbstractTest
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ CacheConfiguration ccfg = defaultCacheConfiguration();
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java
index 88392d1..393fc1f 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java
@@ -18,12 +18,12 @@
package org.gridgain.grid.kernal.processors.rest;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.rest.client.message.*;
import org.gridgain.grid.util.typedef.*;
@@ -113,8 +113,8 @@ public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(LOCAL);
cfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java
index 3f590e5..99b43ab 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java
@@ -19,9 +19,8 @@ package org.gridgain.grid.kernal.processors.rest;
import junit.framework.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
-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.*;
@@ -106,8 +105,8 @@ public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(LOCAL);
cfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java
index f5c7308..42610d4 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java
@@ -18,11 +18,10 @@
package org.gridgain.grid.kernal.processors.rest;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.gridgain.client.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.rest.handlers.*;
import org.gridgain.grid.kernal.processors.rest.handlers.task.*;
@@ -118,8 +117,8 @@ public class GridTaskCommandHandlerSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(cacheName == null || CACHE_NAME.equals(cacheName) ? LOCAL : "replicated".equals(cacheName) ?
REPLICATED : PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java
index f6db0d2..79864ff 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
@@ -52,7 +53,7 @@ public class GridJdbcComplexQuerySelfTest 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/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java
index bdc9a97..4dd9ad5 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-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.*;
@@ -77,8 +77,8 @@ public class GridJdbcConnectionSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
* @throws Exception In case of error.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String name) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String name) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setName(name);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java
index 3128d48..8eed17a 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-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.*;
@@ -49,7 +49,7 @@ public class GridJdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cache = defaultCacheConfiguration();
+ CacheConfiguration cache = defaultCacheConfiguration();
cache.setName(CACHE_NAME);
cache.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java
index 1a889a2..7bedf8c 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -49,7 +50,7 @@ public class GridJdbcLocalCachesSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cache = defaultCacheConfiguration();
+ CacheConfiguration cache = defaultCacheConfiguration();
cache.setName(CACHE_NAME);
cache.setCacheMode(LOCAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java
index 8667ae6..bc5a09d 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
@@ -49,7 +50,7 @@ public class GridJdbcMetadataSelfTest 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/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java
index af3bb5d..c23ea65 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
@@ -55,7 +56,7 @@ public class GridJdbcPreparedStatementSelfTest 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/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java
index 45051e4..e0df667 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
@@ -62,7 +63,7 @@ public class GridJdbcResultSetSelfTest 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/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java
index 51e5b4f..a69134a 100644
--- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
@@ -55,7 +56,7 @@ public class GridJdbcStatementSelfTest 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/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index 116ebfe..d0f5d7b 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -62,7 +62,7 @@
<!--
Partitioned cache example configuration (Transactional mode).
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -111,7 +111,7 @@
<!--
Replicated cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="replicated"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
@@ -136,7 +136,7 @@
<!--
Local cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'local'. -->
<property name="name" value="local"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index 8cb61b7..8ce35cb 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -113,7 +113,7 @@
<!--
Local cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is null. -->
<!--<property name="name"><null/></property>-->
@@ -126,7 +126,7 @@
<!--
Partitioned cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'partitioned'. -->
<property name="name" value="partitioned"/>
@@ -209,7 +209,7 @@
<!--
Local cache with store.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="local.store"/>
<property name="cacheMode" value="LOCAL"/>
@@ -226,7 +226,7 @@
<!--
Replicated cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'replicated'. -->
<property name="name" value="replicated"/>
@@ -241,7 +241,7 @@
<!--
Replicated cache with in-memory store enabled.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'replicated.store'. -->
<property name="name" value="replicated.store"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index 5f5ca5d..e8dfc2d 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -97,7 +97,7 @@
<!--
Local cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is null. -->
<!--<property name="name"><null/></property>-->
@@ -110,7 +110,7 @@
<!--
Partitioned cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'partitioned'. -->
<property name="name" value="partitioned"/>
@@ -193,7 +193,7 @@
<!--
Replicated cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'replicated'. -->
<property name="name" value="replicated"/>
@@ -208,7 +208,7 @@
<!--
Replicated cache with in-memory store enabled.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'replicated.store'. -->
<property name="name" value="replicated.store"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 30850e6..30384d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -226,7 +226,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* that entry will be evicted only if it's not used (not
* participating in any locks or transactions).
* <p>
- * If {@link org.gridgain.grid.cache.GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and
+ * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and
* {@link org.gridgain.grid.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entry will
* be swapped to offheap, and then to disk.
* <h2 class="header">Cache Flags</h2>
@@ -273,7 +273,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* Clears an entry from this cache and swap storage only if the entry
* is not currently locked, and is not participating in a transaction.
* <p>
- * If {@link org.gridgain.grid.cache.GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and
+ * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and
* {@link org.gridgain.grid.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entries will
* also be cleared from swap.
* <p>
@@ -477,7 +477,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* </pre>
* <p>
* Note that this method makes sense only if cache is working in portable mode
- * ({@link org.gridgain.grid.cache.GridCacheConfiguration#isPortableEnabled()} returns {@code true}. If not,
+ * ({@link org.apache.ignite.cache.CacheConfiguration#isPortableEnabled()} returns {@code true}. If not,
* this method is no-op and will return current projection.
*
* @return Projection for portable objects.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
index fa4530b..a18e87e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
@@ -17,9 +17,9 @@
package 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.gridgain.grid.util.typedef.*;
import javax.cache.*;
@@ -99,17 +99,17 @@ public class IgniteCacheManager implements CacheManager {
if (!(cacheCfg instanceof CompleteConfiguration))
throw new UnsupportedOperationException("Configuration is not supported: " + cacheCfg);
- if (cacheCfg instanceof GridCacheConfiguration) {
- String cfgCacheName = ((GridCacheConfiguration)cacheCfg).getName();
+ if (cacheCfg instanceof CacheConfiguration) {
+ String cfgCacheName = ((CacheConfiguration)cacheCfg).getName();
if (cfgCacheName != null) {
if (!cacheName.equals(cfgCacheName))
throw new IllegalArgumentException();
}
else {
- cacheCfg = (C)new GridCacheConfiguration((CompleteConfiguration)cacheCfg);
+ cacheCfg = (C)new CacheConfiguration((CompleteConfiguration)cacheCfg);
- ((GridCacheConfiguration)cacheCfg).setName(cacheName);
+ ((CacheConfiguration)cacheCfg).setName(cacheName);
}
}
@@ -125,7 +125,7 @@ public class IgniteCacheManager implements CacheManager {
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid-for-" + cacheName);
- cfg.setCacheConfiguration(new GridCacheConfiguration((CompleteConfiguration)cacheCfg));
+ cfg.setCacheConfiguration(new CacheConfiguration((CompleteConfiguration)cacheCfg));
cfg.getCacheConfiguration()[0].setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
index 40ccaa2..bbd9f44 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
@@ -255,7 +255,7 @@ import java.util.Date;
* or for a specific type via {@link org.apache.ignite.portables.PortableTypeConfiguration} instance.
* <h1 class="header">Query Indexing</h1>
* Portable objects can be indexed for querying by specifying index fields in
- * {@link GridCacheQueryTypeMetadata} inside of specific {@link GridCacheConfiguration} instance,
+ * {@link GridCacheQueryTypeMetadata} inside of specific {@link org.apache.ignite.cache.CacheConfiguration} instance,
* like so:
* <pre name=code class=xml>
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
index 5167905..6158d99 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.*;
public interface IgniteTransactions {
/**
* Starts transaction with default isolation, concurrency, timeout, and invalidation policy.
- * All defaults are set in {@link GridCacheConfiguration} at startup.
+ * All defaults are set in {@link org.apache.ignite.cache.CacheConfiguration} at startup.
*
* @return New transaction
* @throws IllegalStateException If transaction is already started by this thread.
[06/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
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);
[11/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
deleted file mode 100644
index 95e3523..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
+++ /dev/null
@@ -1,1721 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.grid.cache;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.portables.PortableObject;
-import org.apache.ignite.spi.indexing.*;
-import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.affinity.*;
-import org.gridgain.grid.cache.affinity.consistenthash.*;
-import org.gridgain.grid.cache.cloner.*;
-import org.gridgain.grid.cache.datastructures.*;
-import org.gridgain.grid.cache.eviction.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.configuration.*;
-import java.util.*;
-
-/**
- * This class defines grid cache configuration. This configuration is passed to
- * grid via {@link IgniteConfiguration#getCacheConfiguration()} method. It defines all configuration
- * parameters required to start a cache within grid instance. You can have multiple caches
- * configured with different names within one grid.
- * <p>
- * Cache configuration is set on {@link
- * IgniteConfiguration#setCacheConfiguration(GridCacheConfiguration...)} method. This adapter is a simple bean and
- * can be configured from Spring XML files (or other DI frameworks). <p> Note that absolutely all configuration
- * properties are optional, so users should only change what they need.
- */
-@SuppressWarnings("RedundantFieldInitialization")
-public class GridCacheConfiguration extends MutableConfiguration {
- /** Default atomic sequence reservation size. */
- public static final int DFLT_ATOMIC_SEQUENCE_RESERVE_SIZE = 1000;
-
- /** Default size of preload thread pool. */
- public static final int DFLT_PRELOAD_THREAD_POOL_SIZE = 2;
-
- /** Default preload timeout (ms).*/
- public static final long DFLT_PRELOAD_TIMEOUT = 10000;
-
- /** Time in milliseconds to wait between preload messages to avoid overloading CPU. */
- public static final long DFLT_PRELOAD_THROTTLE = 0;
-
- /**
- * Default time to live. The value is <tt>0</tt> which means that
- * cached objects never expire based on time.
- */
- public static final long DFLT_TIME_TO_LIVE = 0;
-
- /** Default number of backups. */
- public static final int DFLT_BACKUPS = 0;
-
- /** Default caching mode. */
- public static final GridCacheMode DFLT_CACHE_MODE = GridCacheMode.REPLICATED;
-
- /** Default atomicity mode. */
- public static final GridCacheAtomicityMode DFLT_CACHE_ATOMICITY_MODE = GridCacheAtomicityMode.ATOMIC;
-
- /** Default value for cache distribution mode. */
- public static final GridCacheDistributionMode DFLT_DISTRIBUTION_MODE = GridCacheDistributionMode.PARTITIONED_ONLY;
-
- /** Default query timeout. */
- public static final long DFLT_QUERY_TIMEOUT = 0;
-
- /** Default lock timeout. */
- public static final long DFLT_LOCK_TIMEOUT = 0;
-
- /** Initial default cache size. */
- public static final int DFLT_START_SIZE = 1500000;
-
- /** Default cache size to use with eviction policy. */
- public static final int DFLT_CACHE_SIZE = 100000;
-
- /** Initial default near cache size. */
- public static final int DFLT_NEAR_START_SIZE = DFLT_START_SIZE / 4;
-
- /** Default value for 'invalidate' flag that indicates if this is invalidation-based cache. */
- public static final boolean DFLT_INVALIDATE = false;
-
- /** Default value for 'storeValueBytes' flag indicating if value bytes should be stored. */
- public static final boolean DFLT_STORE_VALUE_BYTES = true;
-
- /** Default preload mode for distributed cache. */
- public static final GridCachePreloadMode DFLT_PRELOAD_MODE = GridCachePreloadMode.ASYNC;
-
- /** Default preload batch size in bytes. */
- public static final int DFLT_PRELOAD_BATCH_SIZE = 512 * 1024; // 512K
-
- /** Default maximum eviction queue ratio. */
- public static final float DFLT_MAX_EVICTION_OVERFLOW_RATIO = 10;
-
- /** Default eviction synchronized flag. */
- public static final boolean DFLT_EVICT_SYNCHRONIZED = false;
-
- /** Default near nodes eviction synchronized flag. */
- public static final boolean DFLT_EVICT_NEAR_SYNCHRONIZED = true;
-
- /** Default eviction key buffer size for batching synchronized evicts. */
- public static final int DFLT_EVICT_KEY_BUFFER_SIZE = 1024;
-
- /** Default synchronous eviction timeout in milliseconds. */
- public static final long DFLT_EVICT_SYNCHRONIZED_TIMEOUT = 10000;
-
- /** Default synchronous eviction concurrency level. */
- public static final int DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL = 4;
-
- /** Default value for eager ttl flag. */
- public static final boolean DFLT_EAGER_TTL = true;
-
- /** Default off-heap storage size is {@code -1} which means that off-heap storage is disabled. */
- public static final long DFLT_OFFHEAP_MEMORY = -1;
-
- /** Default value for 'swapEnabled' flag. */
- public static final boolean DFLT_SWAP_ENABLED = false;
-
- /** Default value for 'maxConcurrentAsyncOps'. */
- public static final int DFLT_MAX_CONCURRENT_ASYNC_OPS = 500;
-
- /** Default value for 'queryIndexEnabled' flag. */
- public static final boolean DFLT_QUERY_INDEX_ENABLED = false;
-
- /** Default value for 'writeBehindEnabled' flag. */
- public static final boolean DFLT_WRITE_BEHIND_ENABLED = false;
-
- /** Default flush size for write-behind cache store. */
- public static final int DFLT_WRITE_BEHIND_FLUSH_SIZE = 10240; // 10K
-
- /** Default critical size used when flush size is not specified. */
- public static final int DFLT_WRITE_BEHIND_CRITICAL_SIZE = 16384; // 16K
-
- /** Default flush frequency for write-behind cache store in milliseconds. */
- public static final long DFLT_WRITE_BEHIND_FLUSH_FREQUENCY = 5000;
-
- /** Default count of flush threads for write-behind cache store. */
- public static final int DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT = 1;
-
- /** Default batch size for write-behind cache store. */
- public static final int DFLT_WRITE_BEHIND_BATCH_SIZE = 512;
-
- /** Default maximum number of query iterators that can be stored. */
- public static final int DFLT_MAX_QUERY_ITERATOR_CNT = 1024;
-
- /** Default continuous query buffers queue size. */
- @SuppressWarnings("UnusedDeclaration")
- @Deprecated
- public static final int DFLT_CONT_QUERY_QUEUE_SIZE = 1024 * 1024;
-
- /** Default memory mode. */
- public static final GridCacheMemoryMode DFLT_MEMORY_MODE = GridCacheMemoryMode.ONHEAP_TIERED;
-
- /** Default continuous query max buffer size. */
- @SuppressWarnings("UnusedDeclaration")
- @Deprecated
- public static final int DFLT_CONT_QUERY_MAX_BUF_SIZE = 1024;
-
- /** Cache name. */
- private String name;
-
- /** Default batch size for all cache's sequences. */
- private int seqReserveSize = DFLT_ATOMIC_SEQUENCE_RESERVE_SIZE;
-
- /** Preload thread pool size. */
- private int preloadPoolSize = DFLT_PRELOAD_THREAD_POOL_SIZE;
-
- /** Preload timeout. */
- private long preloadTimeout = DFLT_PRELOAD_TIMEOUT;
-
- /** Default time to live for cache entries. */
- private long ttl = DFLT_TIME_TO_LIVE;
-
- /** Cache expiration policy. */
- private GridCacheEvictionPolicy evictPlc;
-
- /** Near cache eviction policy. */
- private GridCacheEvictionPolicy nearEvictPlc;
-
- /** Flag indicating whether eviction is synchronized. */
- private boolean evictSync = DFLT_EVICT_SYNCHRONIZED;
-
- /** Flag indicating whether eviction is synchronized with near nodes. */
- private boolean evictNearSync = DFLT_EVICT_NEAR_SYNCHRONIZED;
-
- /** Eviction key buffer size. */
- private int evictKeyBufSize = DFLT_EVICT_KEY_BUFFER_SIZE;
-
- /** Synchronous eviction timeout. */
- private int evictSyncConcurrencyLvl = DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL;
-
- /** Synchronous eviction timeout. */
- private long evictSyncTimeout = DFLT_EVICT_SYNCHRONIZED_TIMEOUT;
-
- /** Eviction filter. */
- private GridCacheEvictionFilter<?, ?> evictFilter;
-
- /** Maximum eviction overflow ratio. */
- private float evictMaxOverflowRatio = DFLT_MAX_EVICTION_OVERFLOW_RATIO;
-
- /** Eager ttl flag. */
- private boolean eagerTtl = DFLT_EAGER_TTL;
-
- /** Default lock timeout. */
- private long dfltLockTimeout = DFLT_LOCK_TIMEOUT;
-
- /** Default query timeout. */
- private long dfltQryTimeout = DFLT_QUERY_TIMEOUT;
-
- /** Default cache start size. */
- private int startSize = DFLT_START_SIZE;
-
- /** Default near cache start size. */
- private int nearStartSize = DFLT_NEAR_START_SIZE;
-
- /** Cache distribution mode. */
- private GridCacheDistributionMode distro = DFLT_DISTRIBUTION_MODE;
-
- /** Write synchronization mode. */
- private GridCacheWriteSynchronizationMode writeSync;
-
- /** */
- private CacheStore<?, ?> store;
-
- /** Node group resolver. */
- private GridCacheAffinityFunction aff;
-
- /** Cache mode. */
- private GridCacheMode cacheMode = DFLT_CACHE_MODE;
-
- /** Cache atomicity mode. */
- private GridCacheAtomicityMode atomicityMode;
-
- /** Write ordering mode. */
- private GridCacheAtomicWriteOrderMode atomicWriteOrderMode;
-
- /** Number of backups for cache. */
- private int backups = DFLT_BACKUPS;
-
- /** Flag indicating whether this is invalidation-based cache. */
- private boolean invalidate = DFLT_INVALIDATE;
-
- /** Flag indicating if cached values should be additionally stored in serialized form. */
- private boolean storeValBytes = DFLT_STORE_VALUE_BYTES;
-
- /** Name of class implementing GridCacheTmLookup. */
- private String tmLookupClsName;
-
- /** Distributed cache preload mode. */
- private GridCachePreloadMode preloadMode = DFLT_PRELOAD_MODE;
-
- /** Cache preload order. */
- private int preloadOrder;
-
- /** Preload batch size. */
- private int preloadBatchSize = DFLT_PRELOAD_BATCH_SIZE;
-
- /** Off-heap memory size. */
- private long offHeapMaxMem = DFLT_OFFHEAP_MEMORY;
-
- /** */
- private boolean swapEnabled = DFLT_SWAP_ENABLED;
-
- /** Maximum number of concurrent asynchronous operations. */
- private int maxConcurrentAsyncOps = DFLT_MAX_CONCURRENT_ASYNC_OPS;
-
- /** */
- private boolean qryIdxEnabled = DFLT_QUERY_INDEX_ENABLED;
-
- /** Write-behind feature. */
- private boolean writeBehindEnabled = DFLT_WRITE_BEHIND_ENABLED;
-
- /** Maximum size of write-behind cache. */
- private int writeBehindFlushSize = DFLT_WRITE_BEHIND_FLUSH_SIZE;
-
- /** Write-behind flush frequency in milliseconds. */
- private long writeBehindFlushFreq = DFLT_WRITE_BEHIND_FLUSH_FREQUENCY;
-
- /** Flush thread count for write-behind cache store. */
- private int writeBehindFlushThreadCnt = DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT;
-
- /** Maximum batch size for write-behind cache store. */
- private int writeBehindBatchSize = DFLT_WRITE_BEHIND_BATCH_SIZE;
-
- /** Maximum number of query iterators that can be stored. */
- private int maxQryIterCnt = DFLT_MAX_QUERY_ITERATOR_CNT;
-
- /** Memory mode. */
- private GridCacheMemoryMode memMode = DFLT_MEMORY_MODE;
-
- /** */
- private GridCacheCloner cloner;
-
- /** */
- private GridCacheAffinityKeyMapper affMapper;
-
- /** */
- private String indexingSpiName;
-
- /** */
- private long preloadDelay;
-
- /** */
- private long preloadThrottle = DFLT_PRELOAD_THROTTLE;
-
- /** */
- private GridCacheInterceptor<?, ?> interceptor;
-
- /** */
- private boolean portableEnabled;
-
- /** */
- private boolean keepPortableInStore = true;
-
- /** Query configuration. */
- private GridCacheQueryConfiguration qryCfg;
-
- /** Empty constructor (all values are initialized to their defaults). */
- public GridCacheConfiguration() {
- /* No-op. */
- }
-
- /**
- * Copy constructor.
- *
- * @param cfg Configuration to copy.
- */
- public GridCacheConfiguration(CompleteConfiguration cfg) {
- super(cfg);
-
- if (!(cfg instanceof GridCacheConfiguration))
- return;
-
- GridCacheConfiguration cc = (GridCacheConfiguration)cfg;
-
- /*
- * NOTE: MAKE SURE TO PRESERVE ALPHABETIC ORDER!
- * ==============================================
- */
- aff = cc.getAffinity();
- affMapper = cc.getAffinityMapper();
- atomicityMode = cc.getAtomicityMode();
- atomicWriteOrderMode = cc.getAtomicWriteOrderMode();
- backups = cc.getBackups();
- cacheLoaderFactory = cc.getCacheLoaderFactory();
- cacheMode = cc.getCacheMode();
- cacheWriterFactory = cc.getCacheWriterFactory();
- cloner = cc.getCloner();
- dfltLockTimeout = cc.getDefaultLockTimeout();
- dfltQryTimeout = cc.getDefaultQueryTimeout();
- distro = cc.getDistributionMode();
- eagerTtl = cc.isEagerTtl();
- evictFilter = cc.getEvictionFilter();
- evictKeyBufSize = cc.getEvictSynchronizedKeyBufferSize();
- evictMaxOverflowRatio = cc.getEvictMaxOverflowRatio();
- evictNearSync = cc.isEvictNearSynchronized();
- evictPlc = cc.getEvictionPolicy();
- evictSync = cc.isEvictSynchronized();
- evictSyncConcurrencyLvl = cc.getEvictSynchronizedConcurrencyLevel();
- evictSyncTimeout = cc.getEvictSynchronizedTimeout();
- expiryPolicyFactory = cc.getExpiryPolicyFactory();
- indexingSpiName = cc.getIndexingSpiName();
- interceptor = cc.getInterceptor();
- invalidate = cc.isInvalidate();
- isReadThrough = cc.isReadThrough();
- isWriteThrough = cc.isWriteThrough();
- keepPortableInStore = cc.isKeepPortableInStore();
- offHeapMaxMem = cc.getOffHeapMaxMemory();
- maxConcurrentAsyncOps = cc.getMaxConcurrentAsyncOperations();
- maxQryIterCnt = cc.getMaximumQueryIteratorCount();
- memMode = cc.getMemoryMode();
- name = cc.getName();
- nearStartSize = cc.getNearStartSize();
- nearEvictPlc = cc.getNearEvictionPolicy();
- portableEnabled = cc.isPortableEnabled();
- preloadMode = cc.getPreloadMode();
- preloadBatchSize = cc.getPreloadBatchSize();
- preloadDelay = cc.getPreloadPartitionedDelay();
- preloadOrder = cc.getPreloadOrder();
- preloadPoolSize = cc.getPreloadThreadPoolSize();
- preloadTimeout = cc.getPreloadTimeout();
- preloadThrottle = cc.getPreloadThrottle();
- qryCfg = cc.getQueryConfiguration();
- qryIdxEnabled = cc.isQueryIndexEnabled();
- seqReserveSize = cc.getAtomicSequenceReserveSize();
- startSize = cc.getStartSize();
- store = cc.getStore();
- storeValBytes = cc.isStoreValueBytes();
- swapEnabled = cc.isSwapEnabled();
- tmLookupClsName = cc.getTransactionManagerLookupClassName();
- ttl = cc.getDefaultTimeToLive();
- writeBehindBatchSize = cc.getWriteBehindBatchSize();
- writeBehindEnabled = cc.isWriteBehindEnabled();
- writeBehindFlushFreq = cc.getWriteBehindFlushFrequency();
- writeBehindFlushSize = cc.getWriteBehindFlushSize();
- writeBehindFlushThreadCnt = cc.getWriteBehindFlushThreadCount();
- writeSync = cc.getWriteSynchronizationMode();
- }
-
- /**
- * Cache name. If not provided or {@code null}, then this will be considered a default
- * cache which can be accessed via {@link Ignite#cache(String) Grid.cache(null)} method. Otherwise, if name
- * is provided, the cache will be accessed via {@link Ignite#cache(String)} method.
- *
- * @return Cache name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets cache name.
- *
- * @param name Cache name. May be <tt>null</tt>, but may not be empty string.
- */
- public void setName(String name) {
- A.ensure(name == null || !name.isEmpty(), "Name cannot be null or empty.");
-
- this.name = name;
- }
-
- /**
- * Gets time to live for all objects in cache. This value can be overridden for individual objects.
- * If not set, then value is {@code 0} which means that objects never expire.
- *
- * @return Time to live for all objects in cache.
- */
- public long getDefaultTimeToLive() {
- return ttl;
- }
-
- /**
- * Sets time to live for all objects in cache. This value can be override for individual objects.
- *
- * @param ttl Time to live for all objects in cache.
- */
- public void setDefaultTimeToLive(long ttl) {
- this.ttl = ttl;
- }
-
- /**
- * Gets cache eviction policy. By default, returns {@code null}
- * which means that evictions are disabled for cache.
- *
- * @return Cache eviction policy or {@code null} if evictions should be disabled.
- */
- @SuppressWarnings({"unchecked"})
- @Nullable public <K, V> GridCacheEvictionPolicy<K, V> getEvictionPolicy() {
- return evictPlc;
- }
-
- /**
- * Sets cache eviction policy.
- *
- * @param evictPlc Cache expiration policy.
- */
- public void setEvictionPolicy(@Nullable GridCacheEvictionPolicy evictPlc) {
- this.evictPlc = evictPlc;
- }
-
- /**
- * Gets cache distribution mode. This parameter is taken into account only if
- * {@link #getCacheMode()} is set to {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} mode.
- * <p>
- * If not set, default value is {@link #DFLT_DISTRIBUTION_MODE}.
- *
- * @return Cache distribution mode.
- */
- public GridCacheDistributionMode getDistributionMode() {
- return distro;
- }
-
- /**
- * Sets cache distribution mode.
- *
- * @param distro Distribution mode.
- */
- public void setDistributionMode(GridCacheDistributionMode distro) {
- this.distro = distro;
- }
-
- /**
- * Gets write synchronization mode. This mode controls whether the main
- * caller should wait for update on other nodes to complete or not.
- *
- * @return Write synchronization mode.
- */
- public GridCacheWriteSynchronizationMode getWriteSynchronizationMode() {
- return writeSync;
- }
-
- /**
- * Sets write synchronization mode.
- *
- * @param writeSync Write synchronization mode.
- */
- public void setWriteSynchronizationMode(GridCacheWriteSynchronizationMode writeSync) {
- this.writeSync = writeSync;
- }
-
- /**
- * Gets eviction policy for {@code near} cache which is different from the one used for
- * {@code partitioned} cache. By default, returns {@code null}
- * which means that evictions are disabled for near cache.
- *
- * @return Cache eviction policy or {@code null} if evictions should be disabled.
- */
- @SuppressWarnings({"unchecked"})
- @Nullable public <K, V> GridCacheEvictionPolicy<K, V> getNearEvictionPolicy() {
- return nearEvictPlc;
- }
-
- /**
- * Sets eviction policy for near cache. This property is only used for {@link GridCacheMode#PARTITIONED} caching
- * mode.
- *
- * @param nearEvictPlc Eviction policy for near cache.
- */
- public void setNearEvictionPolicy(@Nullable GridCacheEvictionPolicy nearEvictPlc) {
- this.nearEvictPlc = nearEvictPlc;
- }
-
- /**
- * Gets flag indicating whether eviction is synchronized between primary and
- * backup nodes on partitioned cache. If this parameter is {@code true} and
- * swap is disabled then {@link GridCacheProjection#evict(Object)}
- * and all its variations will involve all nodes where an entry is kept -
- * this is a group of nodes responsible for partition to which
- * corresponding key belongs. If this property is set to {@code false} then
- * eviction is done independently on cache nodes.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED}.
- * <p>
- * Note that it's not recommended to set this value to {@code true} if cache
- * store is configured since it will allow to significantly improve cache
- * performance.
- *
- * @return {@code true} If eviction is synchronized with backup nodes (or the
- * rest of the nodes in case of replicated cache), {@code false} if not.
- */
- public boolean isEvictSynchronized() {
- return evictSync;
- }
-
- /**
- * Sets flag indicating whether eviction is synchronized with backup nodes (or the rest of the nodes for replicated
- * cache).
- *
- * @param evictSync {@code true} if synchronized, {@code false} if not.
- */
- public void setEvictSynchronized(boolean evictSync) {
- this.evictSync = evictSync;
- }
-
- /**
- * Sets flag indicating whether eviction is synchronized with near nodes.
- *
- * @param evictNearSync {@code true} if synchronized, {@code false} if not.
- */
- public void setEvictNearSynchronized(boolean evictNearSync) {
- this.evictNearSync = evictNearSync;
- }
-
- /**
- * Gets flag indicating whether eviction on primary node is synchronized with
- * near nodes where entry is kept. Default value is {@code true} and
- * is defined by {@link #DFLT_EVICT_NEAR_SYNCHRONIZED}.
- * <p>
- * Note that in most cases this property should be set to {@code true} to keep
- * cache consistency. But there may be the cases when user may use some
- * special near eviction policy to have desired control over near cache
- * entry set.
- *
- * @return {@code true} If eviction is synchronized with near nodes in
- * partitioned cache, {@code false} if not.
- */
- public boolean isEvictNearSynchronized() {
- return evictNearSync;
- }
-
- /**
- * Gets size of the key buffer for synchronized evictions.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_KEY_BUFFER_SIZE}.
- *
- * @return Eviction key buffer size.
- */
- public int getEvictSynchronizedKeyBufferSize() {
- return evictKeyBufSize;
- }
-
- /**
- * Sets eviction key buffer size.
- *
- * @param evictKeyBufSize Eviction key buffer size.
- */
- public void setEvictSynchronizedKeyBufferSize(int evictKeyBufSize) {
- this.evictKeyBufSize = evictKeyBufSize;
- }
-
- /**
- * Gets concurrency level for synchronized evictions. This flag only makes sense
- * with {@link #isEvictNearSynchronized()} or {@link #isEvictSynchronized()} set
- * to {@code true}. When synchronized evictions are enabled, it is possible that
- * local eviction policy will try to evict entries faster than evictions can be
- * synchronized with backup or near nodes. This value specifies how many concurrent
- * synchronous eviction sessions should be allowed before the system is forced to
- * wait and let synchronous evictions catch up with the eviction policy.
- * <p>
- * Note that if synchronous evictions start lagging, it is possible that you have either
- * too big or too small eviction key buffer size or small eviction timeout. In that case
- * you will need to adjust {@link #getEvictSynchronizedKeyBufferSize} or
- * {@link #getEvictSynchronizedTimeout()} values as well.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL}.
- *
- * @return Synchronous eviction concurrency level.
- */
- public int getEvictSynchronizedConcurrencyLevel() {
- return evictSyncConcurrencyLvl;
- }
-
- /**
- * Sets concurrency level for synchronized evictions.
- *
- * @param evictSyncConcurrencyLvl Concurrency level for synchronized evictions.
- */
- public void setEvictSynchronizedConcurrencyLevel(int evictSyncConcurrencyLvl) {
- this.evictSyncConcurrencyLvl = evictSyncConcurrencyLvl;
- }
-
- /**
- * Gets timeout for synchronized evictions.
- * <p>
- * Node that initiates eviction waits for responses
- * from remote nodes within this timeout.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_TIMEOUT}.
- *
- * @return Synchronous eviction timeout.
- */
- public long getEvictSynchronizedTimeout() {
- return evictSyncTimeout;
- }
-
- /**
- * Sets timeout for synchronized evictions.
- *
- * @param evictSyncTimeout Timeout for synchronized evictions.
- */
- public void setEvictSynchronizedTimeout(long evictSyncTimeout) {
- this.evictSyncTimeout = evictSyncTimeout;
- }
-
- /**
- * This value denotes the maximum size of eviction queue in percents of cache
- * size in case of distributed cache (replicated and partitioned) and using
- * synchronized eviction (that is if {@link #isEvictSynchronized()} returns
- * {@code true}).
- * <p>
- * That queue is used internally as a buffer to decrease network costs for
- * synchronized eviction. Once queue size reaches specified value all required
- * requests for all entries in the queue are sent to remote nodes and the queue
- * is cleared.
- * <p>
- * Default value is defined by {@link #DFLT_MAX_EVICTION_OVERFLOW_RATIO} and
- * equals to {@code 10%}.
- *
- * @return Maximum size of eviction queue in percents of cache size.
- */
- public float getEvictMaxOverflowRatio() {
- return evictMaxOverflowRatio;
- }
-
- /**
- * Sets maximum eviction overflow ratio.
- *
- * @param evictMaxOverflowRatio Maximum eviction overflow ratio.
- */
- public void setEvictMaxOverflowRatio(float evictMaxOverflowRatio) {
- this.evictMaxOverflowRatio = evictMaxOverflowRatio;
- }
-
- /**
- * Gets eviction filter to specify which entries should not be evicted
- * (except explicit evict by calling {@link GridCacheEntry#evict()}).
- * If {@link GridCacheEvictionFilter#evictAllowed(GridCacheEntry)} method returns
- * {@code false} then eviction policy will not be notified and entry will
- * never be evicted.
- * <p>
- * If not provided, any entry may be evicted depending on
- * {@link #getEvictionPolicy() eviction policy} configuration.
- *
- * @return Eviction filter or {@code null}.
- */
- @SuppressWarnings("unchecked")
- public <K, V> GridCacheEvictionFilter<K, V> getEvictionFilter() {
- return (GridCacheEvictionFilter<K, V>)evictFilter;
- }
-
- /**
- * Sets eviction filter.
- *
- * @param evictFilter Eviction filter.
- */
- public <K, V> void setEvictionFilter(GridCacheEvictionFilter<K, V> evictFilter) {
- this.evictFilter = evictFilter;
- }
-
- /**
- * Gets flag indicating whether expired cache entries will be eagerly removed from cache. When
- * set to {@code false}, expired entries will be removed on next entry access.
- * <p>
- * When not set, default value is {@link #DFLT_EAGER_TTL}.
- * <p>
- * <b>Note</b> that this flag only matters for entries expiring based on
- * {@link GridCacheEntry#timeToLive()} value and should not be confused with entry
- * evictions based on configured {@link GridCacheEvictionPolicy}.
- *
- * @return Flag indicating whether GridGain will eagerly remove expired entries.
- */
- public boolean isEagerTtl() {
- return eagerTtl;
- }
-
- /**
- * Sets eager ttl flag.
- *
- * @param eagerTtl {@code True} if GridGain should eagerly remove expired cache entries.
- * @see #isEagerTtl()
- */
- public void setEagerTtl(boolean eagerTtl) {
- this.eagerTtl = eagerTtl;
- }
-
- /**
- * Gets initial cache size which will be used to pre-create internal
- * hash table after start. Default value is defined by {@link #DFLT_START_SIZE}.
- *
- * @return Initial cache size.
- */
- public int getStartSize() {
- return startSize;
- }
-
- /**
- * Initial size for internal hash map.
- *
- * @param startSize Cache start size.
- */
- public void setStartSize(int startSize) {
- this.startSize = startSize;
- }
-
- /**
- * Gets initial cache size for near cache which will be used to pre-create internal
- * hash table after start. Default value is defined by {@link #DFLT_NEAR_START_SIZE}.
- *
- * @return Initial near cache size.
- */
- public int getNearStartSize() {
- return nearStartSize;
- }
-
- /**
- * Start size for near cache. This property is only used for {@link GridCacheMode#PARTITIONED} caching mode.
- *
- * @param nearStartSize Start size for near cache.
- */
- public void setNearStartSize(int nearStartSize) {
- this.nearStartSize = nearStartSize;
- }
-
- /**
- * Gets underlying persistent storage for read-through and write-through operations.
- * If not provided, cache will not exhibit read-through or write-through behavior.
- *
- * @return Underlying persistent storage for read-through and write-through operations.
- */
- @SuppressWarnings({"unchecked"})
- public <K, V> CacheStore<K, V> getStore() {
- return (CacheStore<K, V>)store;
- }
-
- /**
- * Sets persistent storage for cache data.
- *
- * @param store Persistent cache store.
- */
- public <K, V> void setStore(CacheStore<K, V> store) {
- this.store = store;
- }
-
- /**
- * Gets key topology resolver to provide mapping from keys to nodes.
- *
- * @return Key topology resolver to provide mapping from keys to nodes.
- */
- public GridCacheAffinityFunction getAffinity() {
- return aff;
- }
-
- /**
- * Sets affinity for cache keys.
- *
- * @param aff Cache key affinity.
- */
- public void setAffinity(GridCacheAffinityFunction aff) {
- this.aff = aff;
- }
-
- /**
- * Gets caching mode to use. You can configure cache either to be local-only,
- * fully replicated, partitioned, or near. If not provided, {@link GridCacheMode#REPLICATED}
- * mode will be used by default (defined by {@link #DFLT_CACHE_MODE} constant).
- *
- * @return {@code True} if cache is local.
- */
- public GridCacheMode getCacheMode() {
- return cacheMode;
- }
-
- /**
- * Sets caching mode.
- *
- * @param cacheMode Caching mode.
- */
- public void setCacheMode(GridCacheMode cacheMode) {
- this.cacheMode = cacheMode;
- }
-
- /**
- * Gets cache atomicity mode.
- * <p>
- * Default value is defined by {@link #DFLT_CACHE_ATOMICITY_MODE}.
- *
- * @return Cache atomicity mode.
- */
- public GridCacheAtomicityMode getAtomicityMode() {
- return atomicityMode;
- }
-
- /**
- * Sets cache atomicity mode.
- *
- * @param atomicityMode Cache atomicity mode.
- */
- public void setAtomicityMode(GridCacheAtomicityMode atomicityMode) {
- this.atomicityMode = atomicityMode;
- }
-
- /**
- * Gets cache write ordering mode. This property can be enabled only for {@link GridCacheAtomicityMode#ATOMIC}
- * cache (for other atomicity modes it will be ignored).
- *
- * @return Cache write ordering mode.
- */
- public GridCacheAtomicWriteOrderMode getAtomicWriteOrderMode() {
- return atomicWriteOrderMode;
- }
-
- /**
- * Sets cache write ordering mode. This property can be enabled only for {@link GridCacheAtomicityMode#ATOMIC}
- * cache (for other atomicity modes it will be ignored).
- *
- * @param atomicWriteOrderMode Cache write ordering mode.
- */
- public void setAtomicWriteOrderMode(GridCacheAtomicWriteOrderMode atomicWriteOrderMode) {
- this.atomicWriteOrderMode = atomicWriteOrderMode;
- }
-
- /**
- * Gets number of nodes used to back up single partition for {@link GridCacheMode#PARTITIONED} cache.
- * <p>
- * If not set, default value is {@link #DFLT_BACKUPS}.
- *
- * @return Number of backup nodes for one partition.
- */
- public int getBackups() {
- return backups;
- }
-
- /**
- * Sets number of nodes used to back up single partition for {@link GridCacheMode#PARTITIONED} cache.
- * <p>
- * If not set, default value is {@link #DFLT_BACKUPS}.
- *
- * @param backups Number of backup nodes for one partition.
- */
- public void setBackups(int backups) {
- this.backups = backups;
- }
-
- /**
- * Gets default lock acquisition timeout. Default value is defined by {@link #DFLT_LOCK_TIMEOUT}
- * which is {@code 0} and means that lock acquisition will never timeout.
- *
- * @return Default lock timeout.
- */
- public long getDefaultLockTimeout() {
- return dfltLockTimeout;
- }
-
- /**
- * Sets default lock timeout in milliseconds. By default this value is defined by {@link #DFLT_LOCK_TIMEOUT}.
- *
- * @param dfltLockTimeout Default lock timeout.
- */
- public void setDefaultLockTimeout(long dfltLockTimeout) {
- this.dfltLockTimeout = dfltLockTimeout;
- }
-
- /**
- * Gets default query timeout. Default value is defined by {@link #DFLT_QUERY_TIMEOUT}. {@code 0} (zero)
- * means that the query will never timeout and will wait for completion.
- *
- * @return Default query timeout, {@code 0} for never.
- */
- public long getDefaultQueryTimeout() {
- return dfltQryTimeout;
- }
-
- /**
- * Sets default query timeout, {@code 0} for never. For more information see {@link #getDefaultQueryTimeout()}.
- *
- * @param dfltQryTimeout Default query timeout.
- */
- public void setDefaultQueryTimeout(long dfltQryTimeout) {
- this.dfltQryTimeout = dfltQryTimeout;
- }
-
- /**
- * Invalidation flag. If {@code true}, values will be invalidated (nullified) upon commit in near cache.
- *
- * @return Invalidation flag.
- */
- public boolean isInvalidate() {
- return invalidate;
- }
-
- /**
- * Sets invalidation flag for near cache entries in this transaction. Default is {@code false}.
- *
- * @param invalidate Flag to set this cache into invalidation-based mode. Default value is {@code false}.
- */
- public void setInvalidate(boolean invalidate) {
- this.invalidate = invalidate;
- }
-
- /**
- * Flag indicating if cached values should be additionally stored in serialized form. It's set to true by default.
- *
- * @param storeValBytes {@code true} if cached values should be additionally stored in serialized form, {@code
- * false} otherwise.
- */
- public void setStoreValueBytes(boolean storeValBytes) {
- this.storeValBytes = storeValBytes;
- }
-
- /**
- * Flag indicating if cached values should be additionally stored in serialized form.
- * It's set to {@code true} by default.
- *
- * @return {@code true} if cached values should be additionally stored in
- * serialized form, {@code false} otherwise.
- */
- public boolean isStoreValueBytes() {
- return storeValBytes;
- }
-
- /**
- * Gets class name of transaction manager finder for integration for JEE app servers.
- *
- * @return Transaction manager finder.
- */
- public String getTransactionManagerLookupClassName() {
- return tmLookupClsName;
- }
-
- /**
- * Sets look up mechanism for available {@code TransactionManager} implementation, if any.
- *
- * @param tmLookupClsName Name of class implementing GridCacheTmLookup interface that is used to
- * receive JTA transaction manager.
- */
- public void setTransactionManagerLookupClassName(String tmLookupClsName) {
- this.tmLookupClsName = tmLookupClsName;
- }
-
- /**
- * Sets cache preload mode.
- *
- * @param preloadMode Preload mode.
- */
- public void setPreloadMode(GridCachePreloadMode preloadMode) {
- this.preloadMode = preloadMode;
- }
-
- /**
- * Gets preload mode for distributed cache.
- * <p>
- * Default is defined by {@link #DFLT_PRELOAD_MODE}.
- *
- * @return Preload mode.
- */
- public GridCachePreloadMode getPreloadMode() {
- return preloadMode;
- }
-
- /**
- * Gets cache preload order. Preload order can be set to non-zero value for caches with
- * {@link GridCachePreloadMode#SYNC SYNC} or {@link GridCachePreloadMode#ASYNC ASYNC} preload modes only.
- * <p/>
- * If cache preload order is positive, preloading for this cache will be started only when preloading for
- * all caches with smaller preload order (except caches with preload order {@code 0}) will be completed.
- * <p/>
- * Note that cache with order {@code 0} does not participate in ordering. This means that cache with
- * preload order {@code 1} will never wait for any other caches. All caches with order {@code 0} will
- * be preloaded right away concurrently with each other and ordered preload processes.
- * <p/>
- * If not set, cache order is 0, i.e. preloading is not ordered.
- *
- * @return Cache preload order.
- */
- public int getPreloadOrder() {
- return preloadOrder;
- }
-
- /**
- * Sets cache preload order.
- *
- * @param preloadOrder Cache preload order.
- * @see #getPreloadOrder()
- */
- public void setPreloadOrder(int preloadOrder) {
- this.preloadOrder = preloadOrder;
- }
-
- /**
- * Gets size (in number bytes) to be loaded within a single preload message.
- * Preloading algorithm will split total data set on every node into multiple
- * batches prior to sending data. Default value is defined by
- * {@link #DFLT_PRELOAD_BATCH_SIZE}.
- *
- * @return Size in bytes of a single preload message.
- */
- public int getPreloadBatchSize() {
- return preloadBatchSize;
- }
-
- /**
- * Sets preload batch size.
- *
- * @param preloadBatchSize Preload batch size.
- */
- public void setPreloadBatchSize(int preloadBatchSize) {
- this.preloadBatchSize = preloadBatchSize;
- }
-
- /**
- * Flag indicating whether GridGain should use swap storage by default. By default
- * swap is disabled which is defined via {@link #DFLT_SWAP_ENABLED} constant.
- * <p>
- * Note that this flag may be overridden for cache projection created with flag
- * {@link GridCacheFlag#SKIP_SWAP}.
- *
- * @return {@code True} if swap storage is enabled.
- */
- public boolean isSwapEnabled() {
- return swapEnabled;
- }
-
- /**
- * Flag indicating whether swap storage is enabled or not.
- *
- * @param swapEnabled {@code True} if swap storage is enabled.
- */
- public void setSwapEnabled(boolean swapEnabled) {
- this.swapEnabled = swapEnabled;
- }
-
- /**
- * Gets maximum number of allowed concurrent asynchronous operations. If 0 returned then number
- * of concurrent asynchronous operations is unlimited.
- * <p>
- * If not set, default value is {@link #DFLT_MAX_CONCURRENT_ASYNC_OPS}.
- * <p>
- * If user threads do not wait for asynchronous operations to complete, it is possible to overload
- * a system. This property enables back-pressure control by limiting number of scheduled asynchronous
- * cache operations.
- *
- * @return Maximum number of concurrent asynchronous operations or {@code 0} if unlimited.
- */
- public int getMaxConcurrentAsyncOperations() {
- return maxConcurrentAsyncOps;
- }
-
- /**
- * Sets maximum number of concurrent asynchronous operations.
- *
- * @param maxConcurrentAsyncOps Maximum number of concurrent asynchronous operations.
- * @see #getMaxConcurrentAsyncOperations()
- */
- public void setMaxConcurrentAsyncOperations(int maxConcurrentAsyncOps) {
- this.maxConcurrentAsyncOps = maxConcurrentAsyncOps;
- }
-
- /**
- * Flag indicating whether GridGain should attempt to index value and/or key instances
- * stored in cache. If this property is {@code false}, then all indexing annotations
- * inside of any class will be ignored. By default query indexing is disabled and
- * defined via {@link #DFLT_QUERY_INDEX_ENABLED} constant.
- *
- * @return {@code True} if query indexing is enabled.
- * @see #getMemoryMode()
- */
- public boolean isQueryIndexEnabled() {
- return qryIdxEnabled;
- }
-
- /**
- * Flag indicating whether query indexing is enabled or not.
- *
- * @param qryIdxEnabled {@code True} if query indexing is enabled.
- */
- public void setQueryIndexEnabled(boolean qryIdxEnabled) {
- this.qryIdxEnabled = qryIdxEnabled;
- }
-
- /**
- * Flag indicating whether GridGain should use write-behind behaviour for the cache store.
- * By default write-behind is disabled which is defined via {@link #DFLT_WRITE_BEHIND_ENABLED}
- * constant.
- *
- * @return {@code True} if write-behind is enabled.
- */
- public boolean isWriteBehindEnabled() {
- return writeBehindEnabled;
- }
-
- /**
- * Sets flag indicating whether write-behind is enabled.
- *
- * @param writeBehindEnabled {@code true} if write-behind is enabled.
- */
- public void setWriteBehindEnabled(boolean writeBehindEnabled) {
- this.writeBehindEnabled = writeBehindEnabled;
- }
-
- /**
- * Maximum size of the write-behind cache. If cache size exceeds this value,
- * all cached items are flushed to the cache store and write cache is cleared.
- * <p/>
- * If not provided, default value is {@link #DFLT_WRITE_BEHIND_FLUSH_SIZE}.
- * If this value is {@code 0}, then flush is performed according to the flush frequency interval.
- * <p/>
- * Note that you cannot set both, {@code flush} size and {@code flush frequency}, to {@code 0}.
- *
- * @return Maximum object count in write-behind cache.
- */
- public int getWriteBehindFlushSize() {
- return writeBehindFlushSize;
- }
-
- /**
- * Sets write-behind flush size.
- *
- * @param writeBehindFlushSize Write-behind cache flush size.
- * @see #getWriteBehindFlushSize()
- */
- public void setWriteBehindFlushSize(int writeBehindFlushSize) {
- this.writeBehindFlushSize = writeBehindFlushSize;
- }
-
- /**
- * Frequency with which write-behind cache is flushed to the cache store in milliseconds.
- * This value defines the maximum time interval between object insertion/deletion from the cache
- * ant the moment when corresponding operation is applied to the cache store.
- * <p>
- * If not provided, default value is {@link #DFLT_WRITE_BEHIND_FLUSH_FREQUENCY}.
- * If this value is {@code 0}, then flush is performed according to the flush size.
- * <p>
- * Note that you cannot set both, {@code flush} size and {@code flush frequency}, to {@code 0}.
- *
- * @return Write-behind flush frequency in milliseconds.
- */
- public long getWriteBehindFlushFrequency() {
- return writeBehindFlushFreq;
- }
-
- /**
- * Sets write-behind flush frequency.
- *
- * @param writeBehindFlushFreq Write-behind flush frequency in milliseconds.
- * @see #getWriteBehindFlushFrequency()
- */
- public void setWriteBehindFlushFrequency(long writeBehindFlushFreq) {
- this.writeBehindFlushFreq = writeBehindFlushFreq;
- }
-
- /**
- * Number of threads that will perform cache flushing. Cache flushing is performed
- * when cache size exceeds value defined by
- * {@link #getWriteBehindFlushSize}, or flush interval defined by
- * {@link #getWriteBehindFlushFrequency} is elapsed.
- * <p/>
- * If not provided, default value is {@link #DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT}.
- *
- * @return Count of flush threads.
- */
- public int getWriteBehindFlushThreadCount() {
- return writeBehindFlushThreadCnt;
- }
-
- /**
- * Sets flush thread count for write-behind cache.
- *
- * @param writeBehindFlushThreadCnt Count of flush threads.
- * @see #getWriteBehindFlushThreadCount()
- */
- public void setWriteBehindFlushThreadCount(int writeBehindFlushThreadCnt) {
- this.writeBehindFlushThreadCnt = writeBehindFlushThreadCnt;
- }
-
- /**
- * Maximum batch size for write-behind cache store operations. Store operations (get or remove)
- * are combined in a batch of this size to be passed to
- * {@link org.apache.ignite.cache.store.CacheStore#putAll(IgniteTx, Map)} or
- * {@link org.apache.ignite.cache.store.CacheStore#removeAll(IgniteTx, Collection)} methods.
- * <p/>
- * If not provided, default value is {@link #DFLT_WRITE_BEHIND_BATCH_SIZE}.
- *
- * @return Maximum batch size for store operations.
- */
- public int getWriteBehindBatchSize() {
- return writeBehindBatchSize;
- }
-
- /**
- * Sets maximum batch size for write-behind cache.
- *
- * @param writeBehindBatchSize Maximum batch size.
- * @see #getWriteBehindBatchSize()
- */
- public void setWriteBehindBatchSize(int writeBehindBatchSize) {
- this.writeBehindBatchSize = writeBehindBatchSize;
- }
-
- /**
- * Cloner to be used for cloning values that are returned to user only if {@link GridCacheFlag#CLONE}
- * is set on {@link GridCacheProjection}. Cloning values is useful when it is needed to get value from
- * cache, change it and put it back (if the value was not cloned, then user would be updating the
- * cached reference which would violate cache integrity).
- * <p>
- * <b>NOTE:</b> by default, cache uses {@link GridCacheBasicCloner} implementation which will clone only objects
- * implementing {@link Cloneable} interface. You can also configure cache to use
- * {@link GridCacheDeepCloner} which will perform deep-cloning of all objects returned from cache,
- * regardless of the {@link Cloneable} interface. If none of the above cloners fit your
- * logic, you can also provide your own implementation of {@link GridCacheCloner} interface.
- *
- * @return Cloner to be used if {@link GridCacheFlag#CLONE} flag is set on cache projection.
- */
- @SuppressWarnings({"unchecked"})
- public GridCacheCloner getCloner() {
- return cloner;
- }
-
- /**
- * Sets cloner to be used if {@link GridCacheFlag#CLONE} flag is set on projection.
- *
- * @param cloner Cloner to use.
- * @see #getCloner()
- */
- public void setCloner(GridCacheCloner cloner) {
- this.cloner = cloner;
- }
-
- /**
- * Gets default number of sequence values reserved for {@link GridCacheAtomicSequence} instances. After
- * a certain number has been reserved, consequent increments of sequence will happen locally,
- * without communication with other nodes, until the next reservation has to be made.
- * <p>
- * Default value is {@link #DFLT_ATOMIC_SEQUENCE_RESERVE_SIZE}.
- *
- * @return Atomic sequence reservation size.
- */
- public int getAtomicSequenceReserveSize() {
- return seqReserveSize;
- }
-
- /**
- * Sets default number of sequence values reserved for {@link GridCacheAtomicSequence} instances. After a certain
- * number has been reserved, consequent increments of sequence will happen locally, without communication with other
- * nodes, until the next reservation has to be made.
- *
- * @param seqReserveSize Atomic sequence reservation size.
- * @see #getAtomicSequenceReserveSize()
- */
- public void setAtomicSequenceReserveSize(int seqReserveSize) {
- this.seqReserveSize = seqReserveSize;
- }
-
- /**
- * Gets size of preloading thread pool. Note that size serves as a hint and implementation
- * may create more threads for preloading than specified here (but never less threads).
- * <p>
- * Default value is {@link #DFLT_PRELOAD_THREAD_POOL_SIZE}.
- *
- * @return Size of preloading thread pool.
- */
- public int getPreloadThreadPoolSize() {
- return preloadPoolSize;
- }
-
- /**
- * Sets size of preloading thread pool. Note that size serves as a hint and implementation may create more threads
- * for preloading than specified here (but never less threads).
- *
- * @param preloadPoolSize Size of preloading thread pool.
- */
- public void setPreloadThreadPoolSize(int preloadPoolSize) {
- this.preloadPoolSize = preloadPoolSize;
- }
-
- /**
- * Gets preload timeout (ms).
- * <p>
- * Default value is {@link #DFLT_PRELOAD_TIMEOUT}.
- *
- * @return Preload timeout (ms).
- */
- public long getPreloadTimeout() {
- return preloadTimeout;
- }
-
- /**
- * Sets preload timeout (ms).
- *
- * @param preloadTimeout Preload timeout (ms).
- */
- public void setPreloadTimeout(long preloadTimeout) {
- this.preloadTimeout = preloadTimeout;
- }
-
- /**
- * Gets delay in milliseconds upon a node joining or leaving topology (or crash) after which preloading
- * should be started automatically. Preloading should be delayed if you plan to restart nodes
- * after they leave topology, or if you plan to start multiple nodes at once or one after another
- * and don't want to repartition and preload until all nodes are started.
- * <p>
- * Delayed preloading is applied to {@link GridCacheMode#PARTITIONED} caches only.
- * For better efficiency user should usually make sure that new nodes get placed on
- * the same place of consistent hash ring as the left nodes, and that nodes are
- * restarted before this delay expires. To place nodes on the same place in consistent hash ring,
- * use {@link GridCacheConsistentHashAffinityFunction#setHashIdResolver(GridCacheAffinityNodeHashResolver)}
- * to make sure that a node maps to the same hash ID event if restarted. As an example,
- * node IP address and port combination may be used in this case.
- * <p>
- * Default value is {@code 0} which means that repartitioning and preloading will start
- * immediately upon node leaving topology. If {@code -1} is returned, then preloading
- * will only be started manually by calling {@link GridCache#forceRepartition()} method or
- * from management console.
- *
- * @return Preloading delay, {@code 0} to start preloading immediately, {@code -1} to
- * start preloading manually, or positive value to specify delay in milliseconds
- * after which preloading should start automatically.
- */
- public long getPreloadPartitionedDelay() {
- return preloadDelay;
- }
-
- /**
- * Sets preload delay (see {@link #getPreloadPartitionedDelay()} for more information).
- *
- * @param preloadDelay Preload delay to set.
- */
- public void setPreloadPartitionedDelay(long preloadDelay) {
- this.preloadDelay = preloadDelay;
- }
-
- /**
- * Time in milliseconds to wait between preload messages to avoid overloading of CPU or network.
- * When preloading large data sets, the CPU or network can get over-consumed with preloading messages,
- * which consecutively may slow down the application performance. This parameter helps tune
- * the amount of time to wait between preload messages to make sure that preloading process
- * does not have any negative performance impact. Note that application will continue to work
- * properly while preloading is still in progress.
- * <p>
- * Value of {@code 0} means that throttling is disabled. By default throttling is disabled -
- * the default is defined by {@link #DFLT_PRELOAD_THROTTLE} constant.
- *
- * @return Time in milliseconds to wait between preload messages to avoid overloading of CPU,
- * {@code 0} to disable throttling.
- */
- public long getPreloadThrottle() {
- return preloadThrottle;
- }
-
- /**
- * Time in milliseconds to wait between preload messages to avoid overloading of CPU or network. When preloading
- * large data sets, the CPU or network can get over-consumed with preloading messages, which consecutively may slow
- * down the application performance. This parameter helps tune the amount of time to wait between preload messages
- * to make sure that preloading process does not have any negative performance impact. Note that application will
- * continue to work properly while preloading is still in progress. <p> Value of {@code 0} means that throttling is
- * disabled. By default throttling is disabled - the default is defined by {@link #DFLT_PRELOAD_THROTTLE} constant.
- *
- * @param preloadThrottle Time in milliseconds to wait between preload messages to avoid overloading of CPU, {@code
- * 0} to disable throttling.
- */
- public void setPreloadThrottle(long preloadThrottle) {
- this.preloadThrottle = preloadThrottle;
- }
-
- /**
- * Affinity key mapper used to provide custom affinity key for any given key.
- * Affinity mapper is particularly useful when several objects need to be collocated
- * on the same node (they will also be backed up on the same nodes as well).
- * <p>
- * If not provided, then default implementation will be used. The default behavior
- * is described in {@link GridCacheAffinityKeyMapper} documentation.
- *
- * @return Mapper to use for affinity key mapping.
- */
- public GridCacheAffinityKeyMapper getAffinityMapper() {
- return affMapper;
- }
-
- /**
- * Sets custom affinity mapper. If not provided, then default implementation will be used. The default behavior is
- * described in {@link GridCacheAffinityKeyMapper} documentation.
- *
- * @param affMapper Affinity mapper.
- */
- public void setAffinityMapper(GridCacheAffinityKeyMapper affMapper) {
- this.affMapper = affMapper;
- }
-
- /**
- * Gets name of the SPI to use for indexing. If not specified, the default
- * indexing SPI will be used.
- * <p>
- * This property becomes useful in rare cases when more than one indexing
- * SPI is configured. In majority of the cases default value should be used.
- *
- * @return Name of SPI to use for indexing.
- * @see GridIndexingSpi
- */
- public String getIndexingSpiName() {
- return indexingSpiName;
- }
-
- /**
- * Sets name of the SPI to use for indexing. If not specified, the default
- * indexing SPI will be used.
- * <p>
- * This property becomes useful in rare cases when more than one indexing
- * SPI is configured. In majority of the cases default value should be used.
- *
- * @param indexingSpiName Name.
- * @see GridIndexingSpi
- */
- public void setIndexingSpiName(String indexingSpiName) {
- this.indexingSpiName = indexingSpiName;
- }
-
- /**
- * Gets maximum amount of memory available to off-heap storage. Possible values are
- * <ul>
- * <li>{@code -1} - Means that off-heap storage is disabled.</li>
- * <li>
- * {@code 0} - GridGain will not limit off-heap storage (it's up to user to properly
- * add and remove entries from cache to ensure that off-heap storage does not grow
- * indefinitely.
- * </li>
- * <li>Any positive value specifies the limit of off-heap storage in bytes.</li>
- * </ul>
- * Default value is {@code -1}, specified by {@link #DFLT_OFFHEAP_MEMORY} constant
- * which means that off-heap storage is disabled by default.
- * <p>
- * Use off-heap storage to load gigabytes of data in memory without slowing down
- * Garbage Collection. Essentially in this case you should allocate very small amount
- * of memory to JVM and GridGain will cache most of the data in off-heap space
- * without affecting JVM performance at all.
- * <p>
- * Note that GridGain will throw an exception if max memory is set to {@code -1} and
- * {@code offHeapValuesOnly} flag is set to {@code true}.
- *
- * @return Maximum memory in bytes available to off-heap memory space.
- */
- public long getOffHeapMaxMemory() {
- return offHeapMaxMem;
- }
-
- /**
- * Sets maximum amount of memory available to off-heap storage. Possible values are <ul> <li>{@code -1} - Means that
- * off-heap storage is disabled.</li> <li> {@code 0} - GridGain will not limit off-heap storage (it's up to user to
- * properly add and remove entries from cache to ensure that off-heap storage does not grow infinitely. </li>
- * <li>Any positive value specifies the limit of off-heap storage in bytes.</li> </ul> Default value is {@code -1},
- * specified by {@link #DFLT_OFFHEAP_MEMORY} constant which means that off-heap storage is disabled by default. <p>
- * Use off-heap storage to load gigabytes of data in memory without slowing down Garbage Collection. Essentially in
- * this case you should allocate very small amount of memory to JVM and GridGain will cache most of the data in
- * off-heap space without affecting JVM performance at all.
- *
- * @param offHeapMaxMem Maximum memory in bytes available to off-heap memory space.
- */
- public void setOffHeapMaxMemory(long offHeapMaxMem) {
- this.offHeapMaxMem = offHeapMaxMem;
- }
-
- /**
- * Gets maximum number of query iterators that can be stored. Iterators are stored to
- * support query pagination when each page of data is sent to user's node only on demand.
- * Increase this property if you are running and processing lots of queries in parallel.
- * <p>
- * Default value is {@link #DFLT_MAX_QUERY_ITERATOR_CNT}.
- *
- * @return Maximum number of query iterators that can be stored.
- */
- public int getMaximumQueryIteratorCount() {
- return maxQryIterCnt;
- }
-
- /**
- * Sets maximum number of query iterators that can be stored.
- *
- * @param maxQryIterCnt Maximum number of query iterators that can be stored.
- */
- public void setMaximumQueryIteratorCount(int maxQryIterCnt) {
- this.maxQryIterCnt = maxQryIterCnt;
- }
-
- /**
- * Gets maximum number of entries that can be accumulated before back-pressure
- * is enabled to postpone cache updates until query listeners are notified.
- * If your system is configured properly, then this number should never be reached.
- * <p>
- * Default value is {@link #DFLT_CONT_QUERY_QUEUE_SIZE}.
- *
- * @return Continuous query queue size.
- * @deprecated Ignored in current version.
- */
- @Deprecated
- public int getContinuousQueryQueueSize() {
- return 0;
- }
-
- /**
- * Sets continuous query queue size.
- *
- * @param contQryQueueSize Continuous query queue size.
- * @deprecated Ignored in current version.
- */
- @Deprecated
- public void setContinuousQueryQueueSize(int contQryQueueSize) {
- // No-op.
- }
-
- /**
- * Gets memory mode for cache. Memory mode helps control whether value is stored in on-heap memory,
- * off-heap memory, or swap space. Refer to {@link GridCacheMemoryMode} for more info.
- * <p>
- * Default value is {@link #DFLT_MEMORY_MODE}.
- *
- * @return Memory mode.
- */
- public GridCacheMemoryMode getMemoryMode() {
- return memMode;
- }
-
- /**
- * Sets memory mode for cache.
- *
- * @param memMode Memory mode.
- */
- public void setMemoryMode(GridCacheMemoryMode memMode) {
- this.memMode = memMode;
- }
-
- /**
- * Gets the maximum buffer size for continuous queries. When the current
- * number of entries in buffer exceeds the maximum buffer size, the buffer
- * is flushed to the notification queue. Greater buffer size may improve throughput,
- * but also may increase latency.
- * <p>
- * Default value is either {@link #DFLT_CONT_QUERY_MAX_BUF_SIZE} or
- * {@code GG_CONT_QUERY_MAX_BUF_SIZE} system property value (if specified).
- *
- * @return Maximum buffer size for continuous queries.
- * @deprecated Ignored in current version.
- */
- @Deprecated
- public int getContinuousQueryMaximumBufferSize() {
- return 0;
- }
-
- /**
- * Sets maximum buffer size for continuous queries.
- *
- * @param contQryMaxBufSize Maximum buffer size for continuous queries.
- * @deprecated Ignored in current version.
- */
- @Deprecated
- public void setContinuousQueryMaximumBufferSize(int contQryMaxBufSize) {
- // No-op.
- }
-
- /**
- * Gets cache interceptor.
- *
- * @return Cache interceptor.
- */
- @SuppressWarnings({"unchecked"})
- @Nullable public <K, V> GridCacheInterceptor<K, V> getInterceptor() {
- return (GridCacheInterceptor<K, V>)interceptor;
- }
-
- /**
- * Sets cache interceptor.
- *
- * @param interceptor Cache interceptor.
- */
- public <K, V> void setInterceptor(GridCacheInterceptor<K, V> interceptor) {
- this.interceptor = interceptor;
- }
-
- /**
- * Flag indicating whether GridGain should store portable keys and values
- * as instances of {@link PortableObject}.
- *
- * @return Portable enabled flag.
- */
- public boolean isPortableEnabled() {
- return portableEnabled;
- }
-
- /**
- * Gets portable enabled flag value.
- *
- * @param portableEnabled Portable enabled flag value.
- */
- public void setPortableEnabled(boolean portableEnabled) {
- this.portableEnabled = portableEnabled;
- }
-
- /**
- * Flag indicating that {@link org.apache.ignite.cache.store.CacheStore} implementation
- * is working with portable objects instead of Java objects
- * if portable mode for this cache is enabled ({@link #isPortableEnabled()}
- * flag is {@code true}). Default value of this flag is {@code true},
- * because this is recommended behavior from performance standpoint.
- * <p>
- * If set to {@code false}, GridGain will deserialize keys and
- * values stored in portable format before they are passed
- * to cache store.
- * <p>
- * Note that setting this flag to {@code false} can simplify
- * store implementation in some cases, but it can cause performance
- * degradation due to additional serializations and deserializations
- * of portable objects. You will also need to have key and value
- * classes on all nodes since portables will be deserialized when
- * store is called.
- * <p>
- * This flag is ignored if portable mode is disabled for this
- * cache ({@link #isPortableEnabled()} flag is {@code false}).
- *
- * @return Keep portables in store flag.
- */
- public boolean isKeepPortableInStore() {
- return keepPortableInStore;
- }
-
- /**
- * Sets keep portables in store flag.
- *
- * @param keepPortableInStore Keep portables in store flag.
- */
- public void setKeepPortableInStore(boolean keepPortableInStore) {
- this.keepPortableInStore = keepPortableInStore;
- }
-
- /**
- * Gets query configuration. Query configuration defines which fields should be indexed for objects
- * without annotations or portable objects.
- *
- * @return Cache query configuration.
- */
- public GridCacheQueryConfiguration getQueryConfiguration() {
- return qryCfg;
- }
-
- /**
- * Sets query configuration.
- *
- * @param qryCfg Query configuration.
- * @see GridCacheQueryConfiguration
- */
- public void setQueryConfiguration(GridCacheQueryConfiguration qryCfg) {
- this.qryCfg = qryCfg;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridCacheConfiguration.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheDistributionMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheDistributionMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheDistributionMode.java
index bcf722f..2fbb613 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheDistributionMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheDistributionMode.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
/**
* This enum defines mode in which partitioned cache operates.
* <p>
- * Partitioned distribution mode can be configured via {@link GridCacheConfiguration#getDistributionMode()}
+ * Partitioned distribution mode can be configured via {@link org.apache.ignite.cache.CacheConfiguration#getDistributionMode()}
* configuration property.
*/
public enum GridCacheDistributionMode {
@@ -37,14 +37,14 @@ public enum GridCacheDistributionMode {
* recently accessed keys in a smaller near cache. Amount of recently accessed keys to cache is
* controlled by near eviction policy.
*
- * @see GridCacheConfiguration#getNearEvictionPolicy()
+ * @see org.apache.ignite.cache.CacheConfiguration#getNearEvictionPolicy()
*/
NEAR_ONLY,
/**
* Mode in which local node may store primary and/or backup keys, and also will cache recently accessed keys.
* Amount of recently accessed keys to cache is controlled by near eviction policy.
- * @see GridCacheConfiguration#getNearEvictionPolicy()
+ * @see org.apache.ignite.cache.CacheConfiguration#getNearEvictionPolicy()
*/
NEAR_PARTITIONED,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
index 953c2c3..cdee977 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
@@ -60,7 +60,7 @@ public enum GridCacheFlag {
* automatic cloning of values prior to returning so they can be directly
* updated.
*
- * @see GridCacheConfiguration#getCloner()
+ * @see org.apache.ignite.cache.CacheConfiguration#getCloner()
*/
CLONE,
@@ -82,7 +82,7 @@ public enum GridCacheFlag {
* messages will be sent to set the values to {@code null}.
*
* @see IgniteTx#isInvalidate()
- * @see GridCacheConfiguration#isInvalidate()
+ * @see org.apache.ignite.cache.CacheConfiguration#isInvalidate()
*/
INVALIDATE,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
index 904c844..ecba63b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
* operations. The {@code onBefore} callbacks can also be used to change the values
* stored in cache or preventing entries from being removed from cache.
* <p>
- * Cache interceptor is configured via {@link GridCacheConfiguration#getInterceptor()}
+ * Cache interceptor is configured via {@link org.apache.ignite.cache.CacheConfiguration#getInterceptor()}
* configuration property.
* <p>
* Any grid resource from {@code org.gridgain.grid.resources} package can be injected
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
index 140aac1..b0d355b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
@@ -222,7 +222,7 @@ public interface GridCacheMBean {
* <p/>
* If this value is {@code 0}, then flush is performed only on time-elapsing basis. However,
* when this value is {@code 0}, the cache critical size is set to
- * {@link GridCacheConfiguration#DFLT_WRITE_BEHIND_CRITICAL_SIZE}
+ * {@link org.apache.ignite.cache.CacheConfiguration#DFLT_WRITE_BEHIND_CRITICAL_SIZE}
*
* @return Buffer size that triggers flush procedure.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
index 4f471dc..f1d3100 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
@@ -21,7 +21,7 @@ import org.gridgain.grid.cache.affinity.*;
import org.jetbrains.annotations.*;
/**
- * Enumeration of all supported caching modes. Cache mode is specified in {@link GridCacheConfiguration}
+ * Enumeration of all supported caching modes. Cache mode is specified in {@link org.apache.ignite.cache.CacheConfiguration}
* and cannot be changed after cache has started.
*/
public enum GridCacheMode {
@@ -54,7 +54,7 @@ public enum GridCacheMode {
* <p>
* Note that partitioned cache is always fronted by local
* {@code 'near'} cache which stores most recent data. You
- * can configure the size of near cache via {@link GridCacheConfiguration#getNearEvictionPolicy()}
+ * can configure the size of near cache via {@link org.apache.ignite.cache.CacheConfiguration#getNearEvictionPolicy()}
* configuration property.
*/
PARTITIONED;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
index b87e56d..3855ef3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
@@ -23,8 +23,8 @@ import org.jetbrains.annotations.*;
/**
* Cache preload mode. When preloading is enabled (i.e. has value other than {@link #NONE}), distributed caches
* will attempt to preload all necessary values from other grid nodes. This enumeration is used to configure
- * preloading via {@link GridCacheConfiguration#getPreloadMode()} configuration property. If not configured
- * explicitly, then {@link GridCacheConfiguration#DFLT_PRELOAD_MODE} is used.
+ * preloading via {@link org.apache.ignite.cache.CacheConfiguration#getPreloadMode()} configuration property. If not configured
+ * explicitly, then {@link org.apache.ignite.cache.CacheConfiguration#DFLT_PRELOAD_MODE} is used.
* <p>
* Replicated caches will try to load the full set of cache entries from other nodes (or as defined by
* pluggable {@link GridCacheAffinityFunction}), while partitioned caches will only load the entries for which
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
index 5a4fb32..c9d0405 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
@@ -311,7 +311,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* </pre>
* <p>
* Note that this method makes sense only if cache is working in portable mode
- * ({@link GridCacheConfiguration#isPortableEnabled()} returns {@code true}. If not,
+ * ({@link org.apache.ignite.cache.CacheConfiguration#isPortableEnabled()} returns {@code true}. If not,
* this method is no-op and will return current projection.
*
* @return Projection for portable objects.
@@ -1138,7 +1138,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
/**
* Starts transaction with default isolation, concurrency, timeout, and invalidation policy.
- * All defaults are set in {@link GridCacheConfiguration} at startup.
+ * All defaults are set in {@link org.apache.ignite.cache.CacheConfiguration} at startup.
*
* @return New transaction
* @throws IllegalStateException If transaction is already started by this thread.
@@ -1271,7 +1271,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* Evicts entry associated with given key from cache. Note, that entry will be evicted
* only if it's not used (not participating in any locks or transactions).
* <p>
- * If {@link GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and
+ * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and
* {@link GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entry will
* be swapped to offheap, and then to disk.
* <h2 class="header">Cache Flags</h2>
@@ -1288,7 +1288,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* evicted only if it's not used (not participating in any locks or
* transactions).
* <p>
- * If {@link GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and
+ * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and
* {@link GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entry will
* be swapped to offheap, and then to disk.
* <h2 class="header">Cache Flags</h2>
@@ -1302,7 +1302,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* that entry will be evicted only if it's not used (not
* participating in any locks or transactions).
* <p>
- * If {@link GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and
+ * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and
* {@link GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entry will
* be swapped to offheap, and then to disk.
* <h2 class="header">Cache Flags</h2>
@@ -1317,7 +1317,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* Clears all entries from this cache only if the entry is not
* currently locked or participating in a transaction.
* <p>
- * If {@link GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and
+ * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and
* {@link GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entries will
* also be cleared from swap.
* <p>
@@ -1334,7 +1334,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* Clears an entry from this cache and swap storage only if the entry
* is not currently locked, and is not participating in a transaction.
* <p>
- * If {@link GridCacheConfiguration#isSwapEnabled()} is set to {@code true} and
+ * If {@link org.apache.ignite.cache.CacheConfiguration#isSwapEnabled()} is set to {@code true} and
* {@link GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entries will
* also be cleared from swap.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
index dd27b92..2b8d767 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.*;
* Note that regardless of write synchronization mode, cache data will always remain fully
* consistent across all participating nodes.
* <p>
- * Write synchronization mode may be configured via {@link GridCacheConfiguration#getWriteSynchronizationMode()}
+ * Write synchronization mode may be configured via {@link org.apache.ignite.cache.CacheConfiguration#getWriteSynchronizationMode()}
* configuration property.
*/
public enum GridCacheWriteSynchronizationMode {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinity.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinity.java
index 5905890..7c2746d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinity.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinity.java
@@ -18,7 +18,6 @@
package org.gridgain.grid.cache.affinity;
import org.apache.ignite.cluster.*;
-import org.gridgain.grid.cache.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -43,8 +42,8 @@ public interface GridCacheAffinity<K> {
*
* @return Number of cache partitions.
* @see GridCacheAffinityFunction
- * @see GridCacheConfiguration#getAffinity()
- * @see GridCacheConfiguration#setAffinity(GridCacheAffinityFunction)
+ * @see org.apache.ignite.cache.CacheConfiguration#getAffinity()
+ * @see org.apache.ignite.cache.CacheConfiguration#setAffinity(GridCacheAffinityFunction)
*/
public int partitions();
@@ -54,8 +53,8 @@ public interface GridCacheAffinity<K> {
* @param key Key to get partition id for.
* @return Partition id.
* @see GridCacheAffinityFunction
- * @see GridCacheConfiguration#getAffinity()
- * @see GridCacheConfiguration#setAffinity(GridCacheAffinityFunction)
+ * @see org.apache.ignite.cache.CacheConfiguration#getAffinity()
+ * @see org.apache.ignite.cache.CacheConfiguration#setAffinity(GridCacheAffinityFunction)
*/
public int partition(K key);
@@ -110,8 +109,8 @@ public interface GridCacheAffinity<K> {
* @param n Grid node.
* @return Partition ids for which given projection has primary ownership.
* @see GridCacheAffinityFunction
- * @see GridCacheConfiguration#getAffinity()
- * @see GridCacheConfiguration#setAffinity(GridCacheAffinityFunction)
+ * @see org.apache.ignite.cache.CacheConfiguration#getAffinity()
+ * @see org.apache.ignite.cache.CacheConfiguration#setAffinity(GridCacheAffinityFunction)
*/
public int[] primaryPartitions(ClusterNode n);
@@ -132,8 +131,8 @@ public interface GridCacheAffinity<K> {
* @param n Grid node.
* @return Partition ids for which given projection has backup ownership.
* @see GridCacheAffinityFunction
- * @see GridCacheConfiguration#getAffinity()
- * @see GridCacheConfiguration#setAffinity(GridCacheAffinityFunction)
+ * @see org.apache.ignite.cache.CacheConfiguration#getAffinity()
+ * @see org.apache.ignite.cache.CacheConfiguration#setAffinity(GridCacheAffinityFunction)
*/
public int[] backupPartitions(ClusterNode n);
@@ -151,8 +150,8 @@ public interface GridCacheAffinity<K> {
* @param n Grid node.
* @return Partition ids for which given projection has ownership.
* @see GridCacheAffinityFunction
- * @see GridCacheConfiguration#getAffinity()
- * @see GridCacheConfiguration#setAffinity(GridCacheAffinityFunction)
+ * @see org.apache.ignite.cache.CacheConfiguration#getAffinity()
+ * @see org.apache.ignite.cache.CacheConfiguration#setAffinity(GridCacheAffinityFunction)
*/
public int[] allPartitions(ClusterNode n);
@@ -213,13 +212,13 @@ public interface GridCacheAffinity<K> {
* first in the returned collection.
* <p>
* If there are only cache nodes in the projection with
- * {@link GridCacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}, then this
+ * {@link org.apache.ignite.cache.CacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}, then this
* method will return an empty collection.
*
* @param key Key to get affinity nodes for.
* @return Collection of primary and backup nodes for the key with primary node
* always first, or an empty collection if this projection contains only nodes with
- * {@link GridCacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}.
+ * {@link org.apache.ignite.cache.CacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}.
*/
public Collection<ClusterNode> mapKeyToPrimaryAndBackups(K key);
@@ -229,8 +228,8 @@ public interface GridCacheAffinity<K> {
* @param part Partition id.
* @return Primary node for the given partition.
* @see GridCacheAffinityFunction
- * @see GridCacheConfiguration#getAffinity()
- * @see GridCacheConfiguration#setAffinity(GridCacheAffinityFunction)
+ * @see org.apache.ignite.cache.CacheConfiguration#getAffinity()
+ * @see org.apache.ignite.cache.CacheConfiguration#setAffinity(GridCacheAffinityFunction)
*/
public ClusterNode mapPartitionToNode(int part);
@@ -240,8 +239,8 @@ public interface GridCacheAffinity<K> {
* @param parts Partition ids.
* @return Mapping of given partitions to their primary nodes.
* @see GridCacheAffinityFunction
- * @see GridCacheConfiguration#getAffinity()
- * @see GridCacheConfiguration#setAffinity(GridCacheAffinityFunction)
+ * @see org.apache.ignite.cache.CacheConfiguration#getAffinity()
+ * @see org.apache.ignite.cache.CacheConfiguration#setAffinity(GridCacheAffinityFunction)
*/
public Map<Integer, ClusterNode> mapPartitionsToNodes(Collection<Integer> parts);
@@ -250,13 +249,13 @@ public interface GridCacheAffinity<K> {
* first in the returned collection.
* <p>
* If there are only cache nodes in the projection with
- * {@link GridCacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}, then this
+ * {@link org.apache.ignite.cache.CacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}, then this
* method will return an empty collection.
*
* @param part Partition to get affinity nodes for.
* @return Collection of primary and backup nodes for partition with primary node
* always first, or an empty collection if this projection contains only nodes with
- * {@link GridCacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}.
+ * {@link org.apache.ignite.cache.CacheConfiguration#getDistributionMode()} property set to {@code NEAR_ONLY}.
*/
public Collection<ClusterNode> mapPartitionToPrimaryAndBackups(int part);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityFunction.java
index f1d44d9..de01914 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityFunction.java
@@ -26,7 +26,7 @@ import java.util.*;
/**
* Cache key affinity which maps keys to nodes. This interface is utilized for
* both, replicated and partitioned caches. Cache affinity can be configured
- * for individual caches via {@link GridCacheConfiguration#getAffinity()} method.
+ * for individual caches via {@link org.apache.ignite.cache.CacheConfiguration#getAffinity()} method.
* <p>
* Whenever a key is given to cache, it is first passed to a pluggable
* {@link GridCacheAffinityKeyMapper} which may potentially map this key to an alternate
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityKeyMapper.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityKeyMapper.java
index b8b7037..715b64f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/GridCacheAffinityKeyMapper.java
@@ -17,8 +17,6 @@
package org.gridgain.grid.cache.affinity;
-import org.gridgain.grid.cache.*;
-
import java.io.*;
/**
@@ -37,7 +35,7 @@ import java.io.*;
* than the cache key itself, whenever needed.
* <p>
* A custom (other than default) affinity mapper can be provided
- * via {@link GridCacheConfiguration#getAffinityMapper()} configuration property.
+ * via {@link org.apache.ignite.cache.CacheConfiguration#getAffinityMapper()} configuration property.
* <p>
* For more information on affinity mapping and examples refer to {@link GridCacheAffinityFunction} and
* {@link GridCacheAffinityKeyMapped @GridCacheAffinityKeyMapped} documentation.
[09/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
index c89c656..02c6f42 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.visor.cache;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -122,7 +122,7 @@ public class VisorCache implements Serializable {
Collection<IgnitePair<Integer>> bps = Collections.emptyList();
GridDhtPartitionMap partsMap = null;
- GridCacheConfiguration cfg = ca.configuration();
+ CacheConfiguration cfg = ca.configuration();
GridCacheMode mode = cfg.getCacheMode();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java
index 504e63a..5914d0c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -56,7 +56,7 @@ public class VisorCacheAffinityConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for affinity configuration properties.
*/
- public static VisorCacheAffinityConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheAffinityConfiguration from(CacheConfiguration ccfg) {
GridCacheAffinityFunction aff = ccfg.getAffinity();
Integer dfltReplicas = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java
index 639f2cb..7bc173b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -136,7 +137,7 @@ public class VisorCacheConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for cache configuration properties.
*/
- public static VisorCacheConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheConfiguration from(CacheConfiguration ccfg) {
// TODO gg-9141 Update Visor.
VisorCacheConfiguration cfg = new VisorCacheConfiguration();
@@ -182,13 +183,13 @@ public class VisorCacheConfiguration implements Serializable {
* @param caches Cache configurations.
* @return Data transfer object for cache configurations properties.
*/
- public static Iterable<VisorCacheConfiguration> list(GridCacheConfiguration[] caches) {
+ public static Iterable<VisorCacheConfiguration> list(CacheConfiguration[] caches) {
if (caches == null)
return Collections.emptyList();
final Collection<VisorCacheConfiguration> cfgs = new ArrayList<>(caches.length);
- for (GridCacheConfiguration cache : caches)
+ for (CacheConfiguration cache : caches)
cfgs.add(from(cache));
return cfgs;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
index 9f8c59a..ecef11d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.visor.cache;
+import org.apache.ignite.cache.*;
import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
@@ -52,7 +52,7 @@ public class VisorCacheDefaultConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for default cache configuration properties.
*/
- public static VisorCacheDefaultConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheDefaultConfiguration from(CacheConfiguration ccfg) {
// TODO GG-9141 Update Visor.
VisorCacheDefaultConfiguration cfg = new VisorCacheDefaultConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java
index 49accae..e104d83 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
@@ -42,7 +42,7 @@ public class VisorCacheDgcConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for DGC configuration properties.
*/
- public static VisorCacheDgcConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheDgcConfiguration from(CacheConfiguration ccfg) {
VisorCacheDgcConfiguration cfg = new VisorCacheDgcConfiguration();
return cfg;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java
index db0cbad..bd805b0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.eviction.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -64,7 +64,7 @@ public class VisorCacheEvictionConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for eviction configuration properties.
*/
- public static VisorCacheEvictionConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheEvictionConfiguration from(CacheConfiguration ccfg) {
VisorCacheEvictionConfiguration cfg = new VisorCacheEvictionConfiguration();
final GridCacheEvictionPolicy policy = ccfg.getEvictionPolicy();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java
index 365d952..6c86220 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -49,7 +49,7 @@ public class VisorCacheNearConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for near cache configuration properties.
*/
- public static VisorCacheNearConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheNearConfiguration from(CacheConfiguration ccfg) {
VisorCacheNearConfiguration cfg = new VisorCacheNearConfiguration();
cfg.nearEnabled(GridCacheUtils.isNearEnabled(ccfg));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java
index 39291d5..8a7c0b9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -51,7 +52,7 @@ public class VisorCachePreloadConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for preload configuration properties.
*/
- public static VisorCachePreloadConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCachePreloadConfiguration from(CacheConfiguration ccfg) {
VisorCachePreloadConfiguration cfg = new VisorCachePreloadConfiguration();
cfg.mode(ccfg.getPreloadMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java
index 02497e7..db8d62e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -42,7 +42,7 @@ public class VisorCacheStoreConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for cache store configuration properties.
*/
- public static VisorCacheStoreConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheStoreConfiguration from(CacheConfiguration ccfg) {
VisorCacheStoreConfiguration cfg = new VisorCacheStoreConfiguration();
cfg.store(compactClass(ccfg.getStore()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java
index 955ca72..7bd4d1e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.visor.cache;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
@@ -48,7 +48,7 @@ public class VisorCacheWriteBehindConfiguration implements Serializable {
* @param ccfg Cache configuration.
* @return Data transfer object for write-behind cache configuration properties.
*/
- public static VisorCacheWriteBehindConfiguration from(GridCacheConfiguration ccfg) {
+ public static VisorCacheWriteBehindConfiguration from(CacheConfiguration ccfg) {
VisorCacheWriteBehindConfiguration cfg = new VisorCacheWriteBehindConfiguration();
cfg.enabled(ccfg.isWriteBehindEnabled());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
index 2da75ec..f98f9e6 100644
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
@@ -62,7 +62,7 @@
<!--
Partitioned cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
index 903d131..6446bf6 100644
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
@@ -60,7 +60,7 @@
<!--
Partitioned cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
index d1cac65..36dbf77 100644
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
@@ -60,7 +60,7 @@
<!--
Partitioned cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/discovery-stress.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/discovery-stress.xml b/modules/core/src/test/config/discovery-stress.xml
index afa2702..48051a5 100644
--- a/modules/core/src/test/config/discovery-stress.xml
+++ b/modules/core/src/test/config/discovery-stress.xml
@@ -26,7 +26,7 @@
<property name="peerClassLoadingEnabled" value="false"/>
<property name="cacheConfiguration">
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="cacheMode" value="PARTITIONED"/>
<property name="distributionMode" value="PARTITIONED_ONLY"/>
<property name="preloadMode" value="SYNC"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml
index 25aba6b..03be6e0 100644
--- a/modules/core/src/test/config/example-cache.xml
+++ b/modules/core/src/test/config/example-cache.xml
@@ -126,7 +126,7 @@
</bean>
<!-- Template for all example cache configurations. -->
- <bean id="cache-template" abstract="true" class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean id="cache-template" abstract="true" class="org.apache.ignite.cache.CacheConfiguration">
<!-- Initial cache size. -->
<property name="startSize" value="3000000"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/ggfs-loopback.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml
index f96f9c0..560b5d6 100644
--- a/modules/core/src/test/config/ggfs-loopback.xml
+++ b/modules/core/src/test/config/ggfs-loopback.xml
@@ -106,7 +106,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-data"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
@@ -122,7 +122,7 @@
</property>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-meta"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/ggfs-no-endpoint.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml
index 435e688..935aa2c 100644
--- a/modules/core/src/test/config/ggfs-no-endpoint.xml
+++ b/modules/core/src/test/config/ggfs-no-endpoint.xml
@@ -106,7 +106,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-data"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
@@ -122,7 +122,7 @@
</property>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-meta"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/ggfs-shmem.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml
index 907b852..215b77a 100644
--- a/modules/core/src/test/config/ggfs-shmem.xml
+++ b/modules/core/src/test/config/ggfs-shmem.xml
@@ -106,7 +106,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-data"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
@@ -122,7 +122,7 @@
</property>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="ggfs-meta"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/cache-benchmark.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/cache-benchmark.xml b/modules/core/src/test/config/load/cache-benchmark.xml
index 0d3b6a0..5447e83 100644
--- a/modules/core/src/test/config/load/cache-benchmark.xml
+++ b/modules/core/src/test/config/load/cache-benchmark.xml
@@ -31,7 +31,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -46,7 +46,7 @@
<property name="queryIndexEnabled" value="false"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="local"/>
<property name="cacheMode" value="LOCAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/cache-client-benchmark.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/cache-client-benchmark.xml b/modules/core/src/test/config/load/cache-client-benchmark.xml
index 95eb6e2..717bd7a 100644
--- a/modules/core/src/test/config/load/cache-client-benchmark.xml
+++ b/modules/core/src/test/config/load/cache-client-benchmark.xml
@@ -31,7 +31,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -46,7 +46,7 @@
<property name="queryIndexEnabled" value="false"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="local"/>
<property name="cacheMode" value="LOCAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/dsi-49-server-production.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-49-server-production.xml b/modules/core/src/test/config/load/dsi-49-server-production.xml
index c9ea62d..c87ca23 100644
--- a/modules/core/src/test/config/load/dsi-49-server-production.xml
+++ b/modules/core/src/test/config/load/dsi-49-server-production.xml
@@ -37,7 +37,7 @@
<property name="cacheConfiguration">
<util:list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="PARTITIONED_CACHE"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="startSize" value="500000"/>
@@ -67,7 +67,7 @@
<property name="dgcSuspectLockTimeout" value="60000"/>
<property name="indexAnalyzeSampleSize" value="100"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="REPLICATED_CACHE"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="startSize" value="200"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/dsi-load-client.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-client.xml b/modules/core/src/test/config/load/dsi-load-client.xml
index b08f92f..3236646 100644
--- a/modules/core/src/test/config/load/dsi-load-client.xml
+++ b/modules/core/src/test/config/load/dsi-load-client.xml
@@ -38,7 +38,7 @@
<property name="cacheConfiguration">
<util:list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="REPLICATED_CACHE"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
@@ -47,7 +47,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<property name="swapEnabled" value="false"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="CLIENT_PARTITIONED_CACHE"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/dsi-load-server.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-server.xml b/modules/core/src/test/config/load/dsi-load-server.xml
index 8a4659b..20dfad5 100644
--- a/modules/core/src/test/config/load/dsi-load-server.xml
+++ b/modules/core/src/test/config/load/dsi-load-server.xml
@@ -37,7 +37,7 @@
<property name="cacheConfiguration">
<util:list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="REPLICATED_CACHE"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
@@ -46,7 +46,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<property name="swapEnabled" value="false"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="PARTITIONED_CACHE"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/mongo-multinode-foster.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/mongo-multinode-foster.xml b/modules/core/src/test/config/load/mongo-multinode-foster.xml
index 77545ed..d8303d8 100644
--- a/modules/core/src/test/config/load/mongo-multinode-foster.xml
+++ b/modules/core/src/test/config/load/mongo-multinode-foster.xml
@@ -62,7 +62,7 @@
<!--
Data cache configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="data"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -85,7 +85,7 @@
<!--
Meta cache configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="meta"/>
<property name="cacheMode" value="REPLICATED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-load.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-load.xml b/modules/core/src/test/config/spring-cache-load.xml
index 52ab280..dc1f3fe 100644
--- a/modules/core/src/test/config/spring-cache-load.xml
+++ b/modules/core/src/test/config/spring-cache-load.xml
@@ -48,7 +48,7 @@
<property name="localHost" value="127.0.0.1"/>
<property name="cacheConfiguration">
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="cacheMode" value="PARTITIONED"/>
<property name="preloadMode" value="SYNC"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-put-remove-load.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-put-remove-load.xml b/modules/core/src/test/config/spring-cache-put-remove-load.xml
index 974c71c..eeaa74e 100644
--- a/modules/core/src/test/config/spring-cache-put-remove-load.xml
+++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml
@@ -31,7 +31,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="cache"/>
<property name="swapEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-swap.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-swap.xml b/modules/core/src/test/config/spring-cache-swap.xml
index 5b45e3d..340431f 100644
--- a/modules/core/src/test/config/spring-cache-swap.xml
+++ b/modules/core/src/test/config/spring-cache-swap.xml
@@ -29,7 +29,7 @@
<property name="localHost" value="127.0.0.1"/>
<property name="cacheConfiguration">
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="cacheMode" value="LOCAL"/>
<property name="swapEnabled" value="true"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-teststore.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml
index cc53c85..4f9215c 100644
--- a/modules/core/src/test/config/spring-cache-teststore.xml
+++ b/modules/core/src/test/config/spring-cache-teststore.xml
@@ -29,7 +29,7 @@
<property name="localHost" value="127.0.0.1"/>
<property name="cacheConfiguration">
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="cacheMode" value="PARTITIONED"/>
<property name="swapEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-multicache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml
index a90169f..9efe4d8 100644
--- a/modules/core/src/test/config/spring-multicache.xml
+++ b/modules/core/src/test/config/spring-multicache.xml
@@ -59,7 +59,7 @@
Note that absolutely all configuration properties are optional.
-->
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned1"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -81,7 +81,7 @@
<property name="backups" value="1"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned2"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -103,7 +103,7 @@
<property name="backups" value="1"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned3"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -125,7 +125,7 @@
<property name="backups" value="1"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned4"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -147,7 +147,7 @@
<property name="backups" value="1"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned5"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -170,7 +170,7 @@
<property name="backups" value="1"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned6"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -192,7 +192,7 @@
<property name="backups" value="1"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned7"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -214,7 +214,7 @@
<property name="backups" value="1"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned8"/>
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/websession/spring-cache-1.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml
index eeb6cab..e72bec3 100644
--- a/modules/core/src/test/config/websession/spring-cache-1.xml
+++ b/modules/core/src/test/config/websession/spring-cache-1.xml
@@ -31,7 +31,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -49,7 +49,7 @@
<property name="preloadMode" value="SYNC"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned_tx"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -67,7 +67,7 @@
<property name="preloadMode" value="SYNC"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="replicated"/>
<property name="cacheMode" value="REPLICATED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/websession/spring-cache-2.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml
index b22e71f..a7bf14d 100644
--- a/modules/core/src/test/config/websession/spring-cache-2.xml
+++ b/modules/core/src/test/config/websession/spring-cache-2.xml
@@ -31,7 +31,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -49,7 +49,7 @@
<property name="preloadMode" value="SYNC"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned_tx"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -67,7 +67,7 @@
<property name="preloadMode" value="SYNC"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="replicated"/>
<property name="cacheMode" value="REPLICATED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/websession/spring-cache-3.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml
index f907221..3efd55b 100644
--- a/modules/core/src/test/config/websession/spring-cache-3.xml
+++ b/modules/core/src/test/config/websession/spring-cache-3.xml
@@ -31,7 +31,7 @@
<property name="cacheConfiguration">
<list>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -49,7 +49,7 @@
<property name="preloadMode" value="SYNC"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned_tx"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -67,7 +67,7 @@
<property name="preloadMode" value="SYNC"/>
</bean>
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="replicated"/>
<property name="cacheMode" value="REPLICATED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
index 1c60452..52b129b 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.cache.store.jdbc;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -90,7 +91,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
c.setDiscoverySpi(disco);
- 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/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 9caba0b..0459707 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -10,6 +10,7 @@
package org.apache.ignite.internal.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.lang.*;
@@ -17,12 +18,11 @@ import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.testframework.junits.common.*;
import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import javax.cache.configuration.*;
import javax.cache.integration.*;
import java.util.*;
@@ -99,8 +99,8 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
* @throws Exception In case of error.
*/
@SuppressWarnings("unchecked")
- protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setSwapEnabled(swapEnabled());
cfg.setCacheMode(cacheMode());
@@ -223,12 +223,12 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Object key, @Nullable Object val) {
- storeMap.put(key, val);
+ @Override public void write(Cache.Entry<? extends Object, ? extends Object> entry) {
+ storeMap.put(entry.getKey(), entry.getValue());
}
/** {@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/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
index 8786c27..04798b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import com.google.common.collect.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
@@ -63,10 +64,10 @@ public class IgniteCachingProviderSelfTest extends IgniteCacheAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cache1 = cacheConfiguration(null);
+ CacheConfiguration cache1 = cacheConfiguration(null);
cache1.setName("cache1");
- GridCacheConfiguration cache2 = cacheConfiguration(null);
+ CacheConfiguration cache2 = cacheConfiguration(null);
cache2.setName("cache2");
cfg.setCacheConfiguration(cacheConfiguration(null), cache1, cache2);
@@ -96,13 +97,13 @@ public class IgniteCachingProviderSelfTest extends IgniteCacheAbstractTest {
assertEquals(Collections.<String>emptySet(), Sets.newHashSet(cacheMgr.getCacheNames()));
- Cache<Integer, String> cacheA = cacheMgr.createCache("a", new GridCacheConfiguration());
+ Cache<Integer, String> cacheA = cacheMgr.createCache("a", new CacheConfiguration());
cacheA.put(1, "1");
assertEquals("1", cacheA.get(1));
- cacheMgr.createCache("b", new GridCacheConfiguration());
+ cacheMgr.createCache("b", new CacheConfiguration());
assertEquals(Sets.newHashSet("a", "b"), Sets.newHashSet(cacheMgr.getCacheNames()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 0d3b54f..4a732df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -10,6 +10,7 @@
package org.apache.ignite.internal.processors.cache.expiry;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.transactions.*;
@@ -891,8 +892,8 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
}
/** {@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 (nearCache && gridName.equals(getTestGridName(0)))
cfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
index 8451f1c..d335c31 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.spi.checkpoint.cache;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -55,13 +56,13 @@ public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstrac
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg1 = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg1 = defaultCacheConfiguration();
cacheCfg1.setName(DATA_CACHE);
cacheCfg1.setCacheMode(REPLICATED);
cacheCfg1.setWriteSynchronizationMode(FULL_SYNC);
- GridCacheConfiguration cacheCfg2 = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg2 = defaultCacheConfiguration();
cacheCfg2.setName(CP_CACHE);
cacheCfg2.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index 5d9c289..5b91a0f 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.spi.communication.tcp;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
@@ -85,8 +86,8 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
/**
* @return Cache configuration.
*/
- protected GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(GridCacheMode.PARTITIONED);
cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java b/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java
index 4394ec9..bcc03b8 100644
--- a/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java
+++ b/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java
@@ -18,8 +18,8 @@
package org.gridgain.benchmarks.storevalbytes;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.apache.ignite.spi.communication.tcp.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -111,7 +111,7 @@ public class GridCacheStoreValueBytesNode {
cfg.setPeerClassLoadingEnabled(p2pEnabled);
- GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java
index 4845c75..2e159f9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
@@ -44,7 +45,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setCacheMode(GridCacheMode.PARTITIONED);
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
index 0d5b7a1..8502d78 100644
--- a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.cache.affinity.fair;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
@@ -78,7 +79,7 @@ public class GridCachePartitionFairAffinityNodesSelfTest extends GridCommonAbstr
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration ccfg = cacheConfiguration();
+ CacheConfiguration ccfg = cacheConfiguration();
cfg.setCacheConfiguration(ccfg);
@@ -94,8 +95,8 @@ public class GridCachePartitionFairAffinityNodesSelfTest extends GridCommonAbstr
/**
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
index ebda034..9f03e96 100644
--- a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java
@@ -17,10 +17,9 @@
package org.gridgain.grid.cache.store;
-import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.typedef.*;
import org.jetbrains.annotations.*;
@@ -43,8 +42,8 @@ public class GridCacheLoadOnlyStoreAdapterSelfTest extends GridCacheAbstractSelf
}
/** {@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(new TestStore());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
index 06ec00d..75faef3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
@@ -18,12 +18,11 @@
package org.gridgain.grid.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.ggfs.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -59,8 +58,8 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT
* @return Cache configuration.
*/
@SuppressWarnings("deprecation")
- protected GridCacheConfiguration[] getCacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration[] getCacheConfiguration(String gridName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("dataCache");
cacheCfg.setCacheMode(PARTITIONED);
@@ -72,7 +71,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -81,7 +80,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT
metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
- return new GridCacheConfiguration[] {cacheCfg, metaCacheCfg};
+ return new CacheConfiguration[] {cacheCfg, metaCacheCfg};
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
index f0f6d37..a5b17c4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.ggfs;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -87,8 +88,8 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract
*
* @return Meta cache configuration.
*/
- protected GridCacheConfiguration metaConfiguration() {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ protected CacheConfiguration metaConfiguration() {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setName(META_CACHE_NAME);
@@ -105,8 +106,8 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract
*
* @return Data cache configuration.
*/
- protected GridCacheConfiguration dataConfiguration() {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ protected CacheConfiguration dataConfiguration() {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setName(DATA_CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
index 40ff0e1..ed5e060 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
@@ -18,10 +18,9 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -62,7 +61,7 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest {
else {
assert gridName.endsWith("2") || gridName.endsWith("3");
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setAffinity(new MockCacheAffinityFunction());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
index a835240..4cc117b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -93,7 +93,7 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
else {
assert gridName.endsWith("2") || gridName.endsWith("3");
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
index 5e1bbc4..256217cc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
@@ -18,11 +18,10 @@
package org.gridgain.grid.kernal;
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.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -57,7 +56,7 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest {
else {
assert gridName.endsWith("2");
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
@@ -109,9 +108,9 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest {
* @param g Grid.
* @return Non-system caches.
*/
- private Collection<GridCacheConfiguration> caches(Ignite g) {
- return F.view(Arrays.asList(g.configuration().getCacheConfiguration()), new IgnitePredicate<GridCacheConfiguration>() {
- @Override public boolean apply(GridCacheConfiguration c) {
+ private Collection<CacheConfiguration> caches(Ignite g) {
+ return F.view(Arrays.asList(g.configuration().getCacheConfiguration()), new IgnitePredicate<CacheConfiguration>() {
+ @Override public boolean apply(CacheConfiguration c) {
return c.getName() == null || !c.getName().equals(CU.UTILITY_CACHE_NAME);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
index bf8f394..eb643e7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -72,7 +73,7 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
//cacheCfg.setName(null);
cacheCfg.setCacheMode(GridCacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 998d0ea..d9ed689 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -27,7 +28,6 @@ import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.resources.*;
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.managers.communication.*;
import org.apache.ignite.spi.communication.tcp.*;
@@ -95,7 +95,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
cfg.setCommunicationSpi(new CommunicationSpi());
cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
- 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/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
index 021002b..7acfffc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
@@ -18,10 +18,9 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
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.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -83,7 +82,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
if (getTestGridName(1).equals(gridName))
c.setCacheConfiguration(/* no configured caches */);
else {
- 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/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java
index 2db964d..8dc20b1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -79,8 +79,8 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
* @param cacheName Cache name.
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(@Nullable String cacheName) {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setName(cacheName);
cfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index 6bc3c32..9ed800e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -17,10 +17,10 @@
package org.gridgain.grid.kernal;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
-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.*;
@@ -59,7 +59,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
- 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/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
index d8bffac..508740c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.*;
import org.gridgain.testframework.junits.common.*;
@@ -79,7 +79,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
cfg.setGridName(getTestGridName(0));
- GridCacheConfiguration cc = new GridCacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration();
cc.setAtomicityMode(TRANSACTIONAL);
@@ -91,7 +91,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
cfg.setGridName(getTestGridName(1));
- cc = new GridCacheConfiguration();
+ cc = new CacheConfiguration();
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index f24eee1..692a9d4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.managers.checkpoint;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -25,7 +26,6 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.mbean.*;
import org.apache.ignite.resources.*;
import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.apache.ignite.spi.checkpoint.cache.*;
import org.apache.ignite.spi.checkpoint.jdbc.*;
@@ -131,7 +131,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
if (gridName.contains("cache")) {
String cacheName = "test-checkpoints";
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
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/managers/checkpoint/GridCheckpointTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
index d21228d..2163943 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
@@ -18,12 +18,11 @@
package org.gridgain.grid.kernal.managers.checkpoint;
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.resources.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.checkpoint.*;
import org.apache.ignite.spi.checkpoint.cache.*;
import org.apache.ignite.spi.discovery.*;
@@ -66,8 +65,8 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
/**
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setName(CACHE_NAME);
cfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 4ac6bf4..13f76ce 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.managers.deployment;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -65,7 +66,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
cfg.setPeerClassLoadingEnabled(true);
- 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/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index f5ff088..539b5d8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -18,11 +18,11 @@
package org.gridgain.grid.kernal.managers.discovery;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -79,7 +79,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cCfg = defaultCacheConfiguration();
+ CacheConfiguration cCfg = defaultCacheConfiguration();
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/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java
index 3f38d02..f29b14c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.managers.discovery;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -54,11 +55,11 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disc);
- GridCacheConfiguration ccfg1 = defaultCacheConfiguration();
+ CacheConfiguration ccfg1 = defaultCacheConfiguration();
ccfg1.setName(CACHE_NAME);
- GridCacheConfiguration ccfg2 = defaultCacheConfiguration();
+ CacheConfiguration ccfg2 = defaultCacheConfiguration();
ccfg2.setName(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index ceb5861..13ec1c1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.affinity;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
@@ -61,7 +62,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
cfg.setDiscoverySpi(discoSpi);
if (withCache) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(CACHE_NAME);
cacheCfg.setCacheMode(PARTITIONED);
[03/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
index 7215462..996928e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -33,7 +34,7 @@ public class GridCacheReplicatedJobExecutionTest extends GridCacheAbstractJobExe
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(GridCacheMode.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/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
index a73414c..62b326b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -34,7 +34,7 @@ public class GridCacheReplicatedMarshallerTxTest extends GridCacheMarshallerTxAb
IgniteConfiguration cfg = super.getConfiguration(gridName);
// 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/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
index b66c6f8..20686b0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -39,8 +39,8 @@ public class GridCacheReplicatedMetricsSelfTest extends GridCacheTransactionalAb
}
/** {@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(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
index c5f790f..232d02c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -31,7 +31,7 @@ public class GridCacheReplicatedMultiNodeLockSelfTest extends GridCacheMultiNode
@Override protected IgniteConfiguration getConfiguration() throws Exception {
IgniteConfiguration cfg = super.getConfiguration();
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/distributed/replicated/GridCacheReplicatedMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeSelfTest.java
index 7b208ac..88f4997 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -31,7 +31,7 @@ public class GridCacheReplicatedMultiNodeSelfTest extends GridCacheMultiNodeAbst
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/distributed/replicated/GridCacheReplicatedNearOnlySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNearOnlySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNearOnlySelfTest.java
index 6fc6193..0f9960b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNearOnlySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNearOnlySelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
@@ -27,8 +28,8 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
*/
public class GridCacheReplicatedNearOnlySelfTest extends GridCacheNearOnlySelfTest {
/** {@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.setAffinity(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/replicated/GridCacheReplicatedNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
index 4a9deec..71a6d4e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -34,7 +34,7 @@ public class GridCacheReplicatedNodeFailureSelfTest extends GridCacheNodeFailure
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- 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/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
index b1a37a4..fd285ef 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -33,7 +33,7 @@ public class GridCacheReplicatedNodeRestartSelfTest extends GridCacheAbstractNod
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
index 9d0e80e..84d28ac 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.affinity.rendezvous.*;
/**
@@ -25,8 +25,8 @@ import org.gridgain.grid.cache.affinity.rendezvous.*;
*/
public class GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest {
/** {@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.setAffinity(new GridCacheRendezvousAffinityFunction());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
index a3a55b2..3a9e870 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -33,7 +33,7 @@ public class GridCacheReplicatedTxConcurrentGetTest extends IgniteTxConcurrentGe
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/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
index 6055439..5e08189 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -33,7 +33,7 @@ public class GridCacheReplicatedTxMultiNodeBasicTest extends IgniteTxMultiNodeAb
IgniteConfiguration cfg = super.getConfiguration(gridName);
// Default cache configuration.
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setCacheMode(REPLICATED);
ccfg.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/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
index bfaff88..f9b3ab6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
@@ -17,9 +17,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.log4j.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -52,7 +52,7 @@ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThr
c.setTransactionsConfiguration(tCfg);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
index 209973d..f7e4c46 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
@@ -17,9 +17,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.log4j.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -48,7 +48,7 @@ public class GridCacheReplicatedTxSingleThreadedSelfTest extends IgniteTxSingleT
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
index 6457263..1305466 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -43,7 +43,7 @@ public class GridCacheReplicatedTxTimeoutSelfTest extends IgniteTxTimeoutAbstrac
c.getTransactionsConfiguration().setDefaultTxTimeout(TIMEOUT);
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
index c8129fb..606b2b0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -57,7 +58,7 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(REPLICATED);
cacheCfg.setSwapEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
index 809823d..a56a6de 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-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.*;
@@ -64,7 +64,7 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(REPLICATED);
cacheCfg.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/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 3e65a52..1412542 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated.preloader;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
@@ -53,7 +54,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
c.getTransactionsConfiguration().setDefaultTxConcurrency(OPTIMISTIC);
c.getTransactionsConfiguration().setDefaultTxIsolation(READ_COMMITTED);
- GridCacheConfiguration cc1 = defaultCacheConfiguration();
+ CacheConfiguration cc1 = defaultCacheConfiguration();
cc1.setName("one");
cc1.setCacheMode(REPLICATED);
@@ -64,7 +65,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
cc1.setStore(null);
// Identical configuration.
- GridCacheConfiguration cc2 = new GridCacheConfiguration(cc1);
+ CacheConfiguration cc2 = new CacheConfiguration(cc1);
cc2.setName("two");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
index bfcd010..f55e55f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadOffHeapSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated.preloader;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
@@ -26,8 +26,9 @@ import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
*/
public class GridCacheReplicatedPreloadOffHeapSelfTest extends GridCacheReplicatedPreloadSelfTest {
/** {@inheritDoc} */
- @Override GridCacheConfiguration cacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
+ @Override
+ CacheConfiguration cacheConfiguration(String gridName) {
+ CacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
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/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 5a2408d..cb6a271 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated.preloader;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -97,8 +98,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
* @param gridName Grid name.
* @return Cache configuration.
*/
- GridCacheConfiguration cacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheConfiguration(String gridName) {
+ 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/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
index 6f52e6f..d833d67 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated.preloader;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
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.*;
@@ -52,7 +52,7 @@ public class GridCacheReplicatedPreloadStartStopEventsSelfTest extends GridCommo
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.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/eviction/GridCacheBatchEvictUnswapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
index a318440..eefb72d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
@@ -18,14 +18,15 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.fifo.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -60,8 +61,8 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
cacheCfg.setCacheMode(GridCacheMode.PARTITIONED);
cacheCfg.setStore(new CacheStoreAdapter<Long, String>() {
@@ -75,11 +76,11 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
c.apply((long)i, String.valueOf(i));
}
- @Override public void put(Long key, @Nullable String val) {
+ @Override public void write(Cache.Entry<? extends Long, ? extends String> val) {
// No-op.
}
- @Override public void remove(Long key) {
+ @Override public void delete(Object key) {
// No-op.
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index c169dd3..2e6ce6f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*;
@@ -69,7 +70,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
c.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC);
c.getTransactionsConfiguration().setDefaultTxIsolation(READ_COMMITTED);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/eviction/GridCacheConcurrentEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
index f99ae50..f0377ba 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -67,7 +68,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
c.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC);
c.getTransactionsConfiguration().setDefaultTxIsolation(READ_COMMITTED);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(mode);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
index 17ce8fb..1cf757e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.fifo.*;
@@ -74,7 +75,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes
c.setTransactionsConfiguration(tCfg);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(mode);
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/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index 6680b00..cf8ca02 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
@@ -32,7 +33,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.U;
import org.gridgain.testframework.junits.common.GridCommonAbstractTest;
-import org.jetbrains.annotations.Nullable;
+
+import javax.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -68,7 +70,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
txCfg.setDefaultTxIsolation(txIsolation);
txCfg.setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(cacheMode());
cc.setAtomicityMode(TRANSACTIONAL);
@@ -136,11 +138,11 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
return null;
}
- @Override public void put(String key, @Nullable String val) {
+ @Override public void write(Cache.Entry<? extends String, ? extends String> e) {
// No-op.
}
- @Override public void remove(String key) {
+ @Override public void delete(Object key) {
// No-op.
}
};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
index eb77127..d16d1c7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
@@ -79,7 +80,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(mode);
cc.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/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index fadb12d..e2eb54f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.*;
@@ -63,7 +64,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(mode);
cc.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/eviction/GridCacheEvictionLockUnlockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 2e772da..6bb085c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -62,7 +63,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(mode);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/eviction/GridCacheEvictionTouchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
index a1b3aad..150a575 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
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.*;
@@ -58,7 +58,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
txCfg.setDefaultTxConcurrency(PESSIMISTIC);
txCfg.setDefaultTxIsolation(REPEATABLE_READ);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
index 29ae5ca..5aaeecb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -54,8 +55,8 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest 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);
ccfg.setSwapEnabled(false);
ccfg.setEvictSynchronized(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
index ac0220f..94ab0ec 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction.lru;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.lru.*;
@@ -54,7 +55,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = new GridCacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration();
cc.setAtomicityMode(atomicityMode);
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/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
index f28ec81..974d333 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.eviction.lru;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.lru.*;
@@ -65,7 +66,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = new GridCacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration();
cc.setAtomicityMode(atomicityMode);
cc.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/local/GridCacheAtomicLocalMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
index d1e0a9c..f767c2d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.local;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -32,8 +32,8 @@ public class GridCacheAtomicLocalMetricsSelfTest extends GridCacheAbstractMetric
private static final int GRID_CNT = 1;
/** {@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(LOCAL);
cfg.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/local/GridCacheLocalBasicApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java
index 24883ef..a938fcb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.local;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -31,7 +31,7 @@ public class GridCacheLocalBasicApiSelfTest extends GridCacheBasicApiAbstractTes
@Override protected IgniteConfiguration getConfiguration() throws Exception {
IgniteConfiguration cfg = super.getConfiguration();
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index 1582675..4e268ad 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.local;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
@@ -54,7 +55,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc1 = new GridCacheConfiguration();
+ CacheConfiguration cc1 = new CacheConfiguration();
cc1.setName(CACHE_REGULAR);
cc1.setAtomicityMode(TRANSACTIONAL);
@@ -64,7 +65,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
cc1.setEvictSynchronized(false);
cc1.setEvictNearSynchronized(false);
- GridCacheConfiguration cc2 = new GridCacheConfiguration();
+ CacheConfiguration cc2 = new CacheConfiguration();
cc2.setName(CACHE_OFFHEAP);
cc2.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/local/GridCacheLocalFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
index 2db5b44..b0969d4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.local;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -48,8 +49,8 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT
}
/** {@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.setSwapEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
index 90af785..cd9427f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
@@ -18,14 +18,15 @@
package org.gridgain.grid.kernal.processors.cache.local;
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.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.junits.common.*;
+import javax.cache.*;
import java.util.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -63,7 +64,7 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cache = defaultCacheConfiguration();
+ CacheConfiguration cache = defaultCacheConfiguration();
cache.setName("test-cache");
cache.setCacheMode(LOCAL);
@@ -79,14 +80,10 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
*/
private static class TestStore extends CacheStoreAdapter<Integer, Integer> {
/** {@inheritDoc} */
- @SuppressWarnings({"TypeParameterExtendsFinalClass"})
- @Override public void loadAll(Collection<? extends Integer> keys,
- IgniteBiInClosure<Integer, Integer> c) {
+ @Override public Map<Integer, Integer> loadAll(Iterable<? extends Integer> keys) {
assert keys != null;
- c.apply(1, 1);
- c.apply(2, 2);
- c.apply(3, 3);
+ return F.asMap(1, 1, 2, 2, 3, 3);
}
/** {@inheritDoc} */
@@ -97,12 +94,12 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Integer key, Integer val) {
+ @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(Integer key) {
+ @Override public void delete(Object key) {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
index 5ad1475..21c635b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.cache.local;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -66,7 +66,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/local/GridCacheLocalMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMetricsSelfTest.java
index 42e7b42..30dfe55 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMetricsSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.local;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -40,8 +40,8 @@ public class GridCacheLocalMetricsSelfTest extends GridCacheTransactionalAbstrac
}
/** {@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(LOCAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
index ce1ebfe..0aa2770 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.local;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -70,7 +71,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/local/GridCacheLocalTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
index 74948ac..3dfc697 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
@@ -17,9 +17,9 @@
package org.gridgain.grid.kernal.processors.cache.local;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.log4j.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -38,7 +38,7 @@ public class GridCacheLocalTxMultiThreadedSelfTest extends IgniteTxMultiThreaded
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/local/GridCacheLocalTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
index a6fd1d1..95df7e6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
@@ -17,9 +17,9 @@
package org.gridgain.grid.kernal.processors.cache.local;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.log4j.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -38,7 +38,7 @@ public class GridCacheLocalTxSingleThreadedSelfTest extends IgniteTxSingleThread
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/local/GridCacheLocalTxTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
index ff88ab6..1a6816c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.local;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
@@ -56,7 +57,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.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/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index e3521a4..cf01926 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.query;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
@@ -85,8 +86,8 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
* @param atomicityMode Atomicity mode.
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration(String name, GridCacheAtomicityMode atomicityMode) {
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ private CacheConfiguration cacheConfiguration(String name, GridCacheAtomicityMode atomicityMode) {
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(name);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 0f78df1..6428c05 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -18,13 +18,13 @@
package org.gridgain.grid.kernal.processors.cache.query.continuous;
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.events.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.cache.query.GridCacheContinuousQueryEntry;
@@ -41,6 +41,8 @@ import org.gridgain.testframework.junits.common.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
+import javax.cache.integration.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -70,7 +72,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
cfg.setPeerClassLoadingEnabled(peerClassLoadingEnabled());
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(cacheMode());
cacheCfg.setAtomicityMode(atomicityMode());
@@ -1520,12 +1522,12 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
}
/** {@inheritDoc} */
- @Override public void put(Object key, @Nullable Object val) {
+ @Override public void write(Cache.Entry<?, ?> entry) throws CacheWriterException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(Object key) {
+ @Override public void delete(Object key) throws CacheWriterException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index 0ce7619..15efd48 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.query.reducefields;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
@@ -76,8 +77,8 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
* @param name Cache name.
* @return Cache.
*/
- private GridCacheConfiguration cache(@Nullable String name) {
- GridCacheConfiguration cache = defaultCacheConfiguration();
+ private CacheConfiguration cache(@Nullable String name) {
+ CacheConfiguration cache = defaultCacheConfiguration();
cache.setName(name);
cache.setCacheMode(cacheMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
index b210e2e..e0a8ab5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.dataload;
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.*;
@@ -168,8 +169,8 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
*
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() {
+ 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/dataload/GridDataLoaderPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java
index 4e7870b..2dfbae3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.dataload;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-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.*;
@@ -77,7 +77,7 @@ public class GridDataLoaderPerformanceTest extends GridCommonAbstractTest {
cfg.setPeerClassLoadingEnabled(true);
if (useCache) {
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
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/dataload/GridDataLoaderProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
index 0cb0cbb..f1e746d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.dataload;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -84,7 +85,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
if (useCache) {
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(mode);
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/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
index 7d78f94..b29790e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.gridgain.grid.*;
@@ -99,7 +100,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
ggfsCfg.setPathModes(pathModes);
- GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -114,7 +115,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
dataCacheCfg.setBackups(0);
dataCacheCfg.setQueryIndexEnabled(false);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -161,7 +162,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
ggfsCfg.setDefaultMode(PRIMARY);
ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap(SECONDARY_REST_CFG));
- GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -172,7 +173,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
dataCacheCfg.setQueryIndexEnabled(false);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
index 2eb429b..eefcc6a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -189,7 +190,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
ggfsCfg.setPrefetchBlocks(PREFETCH_BLOCKS);
ggfsCfg.setSequentialReadsBeforePrefetch(SEQ_READS_BEFORE_PREFETCH);
- GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -202,7 +203,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
dataCacheCfg.setMemoryMode(memoryMode);
dataCacheCfg.setOffHeapMaxMemory(0);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java
index d0528dd..3385805 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.gridgain.grid.cache.*;
@@ -68,8 +69,8 @@ public class GridGgfsCacheSelfTest extends GridGgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected GridCacheConfiguration cacheConfiguration(String cacheName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String cacheName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java
index 9d8116a..4d0e847 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
@@ -108,8 +109,8 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected GridCacheConfiguration cacheConfiguration(String cacheName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String cacheName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
[04/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index 8c73b7c..b5e1995 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
@@ -55,7 +56,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(gridName);
if (cache) {
- 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/distributed/near/GridCacheNearPartitionedClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
index 98e741a..2f03664 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
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.*;
@@ -77,7 +78,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(CACHE_NAME);
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/distributed/near/GridCacheNearReaderPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
index 0be4bb1..d655ac6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -121,7 +121,7 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest {
*/
private IgniteConfiguration dataNode(TcpDiscoveryIpFinder ipFinder, String gridName)
throws Exception {
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(CACHE_NAME);
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/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index 88b27f3..69b8f2a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
@@ -59,7 +60,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- 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/distributed/near/GridCacheNearRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java
index 73c9209..0971088 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -34,8 +34,8 @@ public class GridCacheNearRemoveFailureTest extends GridCacheAbstractRemoveFailu
}
/** {@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.setDistributionMode(NEAR_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/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index 0cba0d5..f9609a5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
@@ -60,7 +61,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(gridName);
// Default cache configuration.
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.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/near/GridCacheNearTxPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java
index 0768bbc..abe22c9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -33,8 +34,8 @@ public class GridCacheNearTxPreloadSelfTest extends IgniteTxPreloadAbstractTest
}
/** {@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.setDistributionMode(NEAR_PARTITIONED);
cfg.setBackups(4);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
index 8e4b443..6ccdec2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -64,7 +64,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends
c.setDiscoverySpi(spi);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
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/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
index c6cc8dd..6cf81b8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java
@@ -18,12 +18,12 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.testframework.*;
@@ -49,7 +49,7 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm
aff.setHashIdResolver(rslvr);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setAffinity(aff);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index 949d961..690e3ef 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -18,12 +18,12 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
@@ -65,7 +65,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- 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/near/GridCachePartitionedBasicApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java
index cb17363..7c681b7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicApiTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -33,7 +33,7 @@ public class GridCachePartitionedBasicApiTest extends GridCacheBasicApiAbstractT
@Override protected IgniteConfiguration getConfiguration() throws Exception {
IgniteConfiguration cfg = super.getConfiguration();
- 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/distributed/near/GridCachePartitionedBasicOpSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java
index 5047c20..7e44e37 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -32,7 +33,7 @@ public class GridCachePartitionedBasicOpSelfTest extends GridCacheBasicOpAbstrac
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index 4164c86..ec6a1ac 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
@@ -83,7 +84,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
c.setDiscoverySpi(disco);
- 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/distributed/near/GridCachePartitionedEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
index c037556..67a6e08 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -31,8 +31,8 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*;
*/
public class GridCachePartitionedEventSelfTest extends GridCacheEventAbstractTest {
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(gridCount() - 1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index 38d76a2..ac4ae99 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.eviction.fifo.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -75,7 +75,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT
c.setDiscoverySpi(spi);
- 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/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
index f3e3e8c0..91c5e12 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -58,7 +59,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/near/GridCachePartitionedFilteredPutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
index bdb273f..eaa7a03 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
@@ -62,8 +63,8 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
/**
* @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/distributed/near/GridCachePartitionedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
index b8d3c80..e3f1d3e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
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.consistenthash.*;
@@ -48,8 +49,8 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
}
/** {@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.setEvictNearSynchronized(false);
cfg.setEvictSynchronized(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
index 4ffc87a..f1ea543 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
@@ -18,19 +18,21 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
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.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
+
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
@@ -51,7 +53,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes
@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);
@@ -137,12 +139,12 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override public void put(Integer key, String val) {
+ @Override public void write(Cache.Entry<? extends Integer, ? extends String> e) {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(Integer key) {
+ @Override public void delete(Object key) {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
index 3b94d87..ed5a013 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.log4j.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -66,7 +66,7 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest
cfg.setGridName(getTestGridName(0));
cfg.setRestEnabled(false);
- cfg.setCacheConfiguration(new GridCacheConfiguration());
+ cfg.setCacheConfiguration(new CacheConfiguration());
final Ignite g0 = G.start(cfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
index 472f544..0d7e44b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -42,8 +42,8 @@ public class GridCachePartitionedMetricsSelfTest extends GridCacheTransactionalA
}
/** {@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(gridCount() - 1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 86a7910..7dd80a3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -97,7 +98,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
cfg.setDiscoverySpi(spi);
// Default cache configuration.
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setPreloadMode(NONE);
cacheCfg.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/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 0c65c7a..f7544c8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -45,8 +46,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cc = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cc = super.cacheConfiguration(gridName);
cc.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/near/GridCachePartitionedMultiNodeLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
index d6cf5a8..f9de9d3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -34,7 +34,7 @@ public class GridCachePartitionedMultiNodeLockSelfTest extends GridCacheMultiNod
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setBackups(2); // 2 backups, so all nodes are involved.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java
index 8a92d06..269f1f1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -33,7 +34,7 @@ public class GridCachePartitionedMultiNodeSelfTest extends GridCacheMultiNodeAbs
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setBackups(2); // 1 + backups == gridCnt.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index 1899b8a..85dfcb1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
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.*;
@@ -62,7 +63,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- 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/distributed/near/GridCachePartitionedNestedTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java
index 59ba6ee..7a3182a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNestedTxTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -33,7 +33,7 @@ public class GridCachePartitionedNestedTxTest extends GridCacheNestedTxAbstractT
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/near/GridCachePartitionedNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java
index a459832..1e5c93e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -35,7 +36,7 @@ public class GridCachePartitionedNodeFailureSelfTest extends GridCacheNodeFailur
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/near/GridCachePartitionedNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
index cd3e5af..6dd18fc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -37,7 +37,7 @@ public class GridCachePartitionedNodeRestartTest extends GridCacheAbstractNodeRe
c.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC);
- 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/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
index 7769582..d533994 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
@@ -17,9 +17,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+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.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -37,7 +37,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb
c.getTransactionsConfiguration().setDefaultTxConcurrency(OPTIMISTIC);
- 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/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
index b747f48..0bb6af1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
@@ -49,7 +50,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
c.getTransactionsConfiguration().setDefaultTxConcurrency(IgniteTxConcurrency.OPTIMISTIC);
c.getTransactionsConfiguration().setDefaultTxIsolation(IgniteTxIsolation.READ_COMMITTED);
- GridCacheConfiguration cc1 = defaultCacheConfiguration();
+ CacheConfiguration cc1 = defaultCacheConfiguration();
cc1.setName("one");
cc1.setCacheMode(PARTITIONED);
@@ -63,7 +64,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
cc1.setNearEvictionPolicy(null);
// Identical configuration.
- GridCacheConfiguration cc2 = new GridCacheConfiguration(cc1);
+ CacheConfiguration cc2 = new CacheConfiguration(cc1);
cc2.setName("two");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
index 8fd94d4..29766f5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -34,8 +35,8 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
*/
public class GridCachePartitionedProjectionSelfTest extends GridCacheAbstractProjectionSelfTest {
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cc = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cc = super.cacheConfiguration(gridName);
cc.setEvictSynchronized(false);
cc.setEvictNearSynchronized(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
index 93b323a..9e81f63 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -67,7 +68,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
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/near/GridCachePartitionedStorePutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
index eaddb3d..235a000 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
@@ -17,20 +17,19 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
-import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.concurrent.atomic.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -81,8 +80,8 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
/**
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(PARTITIONED);
cfg.setStore(new TestStore());
@@ -133,12 +132,12 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override public void put(Object key, @Nullable Object val) {
+ @Override public void write(Cache.Entry<? extends Object, ? extends Object> e) {
// No-op
}
/** {@inheritDoc} */
- @Override public void remove(Object key) {
+ @Override public void delete(Object key) {
// No-op
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
index 980390c..c4e67c0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -33,7 +33,7 @@ public class GridCachePartitionedTxConcurrentGetTest extends IgniteTxConcurrentG
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/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
index 9388a6d..c985529 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -33,7 +33,7 @@ public class GridCachePartitionedTxMultiNodeSelfTest extends IgniteTxMultiNodeAb
IgniteConfiguration cfg = super.getConfiguration(gridName);
// Default cache configuration.
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setCacheMode(PARTITIONED);
ccfg.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/near/GridCachePartitionedTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
index e96262e..abbd1a4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
@@ -17,9 +17,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.log4j.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -45,7 +45,7 @@ public class GridCachePartitionedTxMultiThreadedSelfTest extends IgniteTxMultiTh
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- 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/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 00bbc82..4d86204 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*;
@@ -74,7 +75,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(GridCacheMode.PARTITIONED);
cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 18));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
index 8ab7d5a..37b40fa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.log4j.*;
import org.gridgain.grid.cache.*;
@@ -46,7 +47,7 @@ public class GridCachePartitionedTxSingleThreadedSelfTest extends IgniteTxSingle
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- 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/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
index 1fae232..9fb218e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -52,7 +52,7 @@ public class GridCachePartitionedTxTimeoutSelfTest extends IgniteTxTimeoutAbstra
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/distributed/near/GridCachePutArrayValueSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
index 99a66e8..0eb0808 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -35,8 +36,8 @@ public class GridCachePutArrayValueSelfTest extends GridCacheAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
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/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
index ddc8fe0..173e3da 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
@@ -39,7 +40,7 @@ public class GridCacheRendezvousAffinityClientSelfTest extends GridCommonAbstrac
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setCacheMode(GridCacheMode.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/distributed/near/GridPartitionedBackupLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
index 00ee06f..97b8caa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.*;
@@ -25,8 +26,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.gridgain.grid.cache.*;
import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -74,8 +75,8 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
/**
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(1);
@@ -140,12 +141,12 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Integer key, @Nullable Integer val) {
- map.put(key, val);
+ @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) {
+ map.put(e.getKey(), e.getValue());
}
/** {@inheritDoc} */
- @Override public void remove(Integer key) {
+ @Override public void delete(Object key) {
// No-op
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
index abd69e6..df22774 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -41,8 +41,8 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration0() {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ @Override protected CacheConfiguration cacheConfiguration0() {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setCacheMode(REPLICATED);
cfg.setAtomicityMode(TRANSACTIONAL);
@@ -55,8 +55,8 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration offheapCacheConfiguration0() {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ @Override protected CacheConfiguration offheapCacheConfiguration0() {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setCacheMode(REPLICATED);
cfg.setAtomicityMode(TRANSACTIONAL);
@@ -69,8 +69,8 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration offheapTieredCacheConfiguration0() {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ @Override protected CacheConfiguration offheapTieredCacheConfiguration0() {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setCacheMode(REPLICATED);
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/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
index 48c62a6..a45a85e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -32,8 +32,8 @@ public class GridCacheAtomicReplicatedMetricsSelfTest extends GridCacheAbstractM
private static final int GRID_CNT = 2;
/** {@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(REPLICATED);
cfg.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/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
index e907b3f..76e2e53 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -49,8 +50,8 @@ public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCache
}
/** {@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(atomicWriteOrderMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicApiTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicApiTest.java
index 39e7496..3966e18 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicApiTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicApiTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -31,7 +31,7 @@ public class GridCacheReplicatedBasicApiTest extends GridCacheBasicApiAbstractTe
@Override protected IgniteConfiguration getConfiguration() throws Exception {
IgniteConfiguration cfg = super.getConfiguration();
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/distributed/replicated/GridCacheReplicatedBasicOpSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicOpSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicOpSelfTest.java
index ec3860d..0ca8fc0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicOpSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicOpSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -31,7 +31,7 @@ public class GridCacheReplicatedBasicOpSelfTest extends GridCacheBasicOpAbstract
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java
index 7261d51..a3ddc24 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedClientOnlySelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
@@ -27,8 +28,8 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
*/
public class GridCacheReplicatedClientOnlySelfTest extends GridCacheClientOnlySelfTest {
/** {@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.setAffinity(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/replicated/GridCacheReplicatedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
index 6d49540..347540e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -45,8 +46,8 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe
}
/** {@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.setEvictSynchronized(true);
ccfg.setEvictSynchronizedKeyBufferSize(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
index 25f21df..328e0eb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -47,8 +48,8 @@ public class GridCacheReplicatedFullApiSelfTest extends GridCacheAbstractFullApi
}
/** {@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.setSwapEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
index 990a48f..95551b8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.*;
@@ -80,7 +81,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes
c.setCommunicationSpi(new TestCommunicationSpi());
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setPreloadMode(NONE);
cc.setCacheMode(REPLICATED);
[07/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
index 5838b17..db50b8e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.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.*;
@@ -56,8 +57,8 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT
/**
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
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/GridCacheMultiUpdateLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
index a12e198..3d855ad 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.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.*;
@@ -71,8 +72,8 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
/**
* @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/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
index b60aca8..5047a94 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
/**
*
@@ -29,8 +29,8 @@ public class GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends GridCa
}
/** {@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.setBackups(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccFlagsTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccFlagsTest.java
index d439d57..5bb8d26 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccFlagsTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccFlagsTest.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.kernal.*;
import org.gridgain.testframework.junits.common.*;
@@ -54,7 +54,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration() throws Exception {
IgniteConfiguration cfg = super.getConfiguration();
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/GridCacheMvccManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java
index 1feddd4..f1908d8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.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.*;
@@ -56,8 +57,8 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest {
}
/** @return Cache configuration. */
- protected GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setCacheMode(mode);
cfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/GridCacheMvccPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java
index 4cfad07..a1b7eb3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.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.kernal.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -68,7 +68,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- 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/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
index c5119b0..01a0a11 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
@@ -17,9 +17,9 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -67,7 +67,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.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/GridCacheObjectToStringSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java
index f82ba3c..8f1b262 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.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.*;
@@ -62,7 +63,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest {
discoSpi.setIpFinder(ipFinder);
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(cacheMode);
cacheCfg.setEvictionPolicy(evictionPlc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
index f6a8bc0..50a794e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.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.lang.*;
import org.gridgain.grid.cache.*;
import org.gridgain.testframework.*;
@@ -45,8 +46,8 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setAtomicityMode(atomicityMode());
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/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
index 1a33013..1b065a9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.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.*;
@@ -76,7 +77,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setSwapEnabled(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java
index 50343be..8c376d8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.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.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.fifo.*;
@@ -67,7 +68,7 @@ public class GridCacheOffHeapTest extends GridCommonAbstractTest {
cfg.setSwapSpaceSpi(new NoopSwapSpaceSpi());
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
cacheCfg.setSwapEnabled(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 30564ca..d303e7c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -18,12 +18,12 @@
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.portables.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
-import org.gridgain.grid.util.typedef.*;
import org.jetbrains.annotations.*;
import org.junit.*;
@@ -73,8 +73,8 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
}
/** {@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/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index 48eee72..57305b2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.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.portables.*;
import org.gridgain.grid.cache.*;
@@ -76,8 +77,8 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
}
/** {@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/GridCacheOffheapUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java
index 73eb85e..eb1b75a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.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.*;
@@ -37,7 +38,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
cfg.setPeerClassLoadingEnabled(false);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setCacheMode(GridCacheMode.PARTITIONED);
ccfg.setDistributionMode(GridCacheDistributionMode.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/GridCacheOrderedPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
index 549ac18..038cc14 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.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.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -75,8 +76,8 @@ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest {
* @param name Cache name.
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfig(GridCacheMode cacheMode, int preloadOrder, String name) {
- GridCacheConfiguration cfg = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfig(GridCacheMode cacheMode, int preloadOrder, String name) {
+ CacheConfiguration cfg = defaultCacheConfiguration();
cfg.setName(name);
cfg.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/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
index b08b6df..da15db1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.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.jdk.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -78,7 +78,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
- GridCacheConfiguration repCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration repCacheCfg = defaultCacheConfiguration();
repCacheCfg.setName("replicated");
repCacheCfg.setCacheMode(REPLICATED);
@@ -92,7 +92,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
else
repCacheCfg.setSwapEnabled(true);
- GridCacheConfiguration partCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration partCacheCfg = defaultCacheConfiguration();
partCacheCfg.setName("partitioned");
partCacheCfg.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/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java
index e1f364c..d33565a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.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.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -81,8 +82,8 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
/**
* @return Cache configuration.
*/
- private GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ private CacheConfiguration cacheConfiguration() {
+ 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/GridCachePartitionedProjectionAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
index 1005e13..cdefdd1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.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.gridgain.grid.cache.*;
@@ -51,7 +52,7 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- 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/GridCachePartitionedWritesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java
index 7925e7c..5292630 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.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.configuration.*;
import org.apache.ignite.transactions.*;
@@ -24,8 +25,8 @@ 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.atomic.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -51,7 +52,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest {
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(GridCacheMode.PARTITIONED);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
@@ -78,18 +79,18 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest {
final AtomicInteger putCnt = new AtomicInteger();
final AtomicInteger rmvCnt = new AtomicInteger();
- store = new CacheStoreAdapter() {
+ store = new CacheStoreAdapter<Object, Object>() {
@Override public Object load(Object key) {
info(">>> Get [key=" + key + ']');
return null;
}
- @Override public void put(Object key, @Nullable Object val) {
+ @Override public void write(Cache.Entry<? extends Object, ? extends Object> entry) {
putCnt.incrementAndGet();
}
- @Override public void remove(Object key) {
+ @Override public void delete(Object key) {
rmvCnt.incrementAndGet();
}
};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 469360e..ed98a3a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.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.*;
@@ -67,7 +68,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration partCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration partCacheCfg = defaultCacheConfiguration();
partCacheCfg.setCacheMode(PARTITIONED);
partCacheCfg.setAffinity(new GridCacheModuloAffinityFunction(1, 1));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
index a8c8f20..47541b8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.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.*;
@@ -615,7 +616,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
else if (gridName.startsWith("worker")) {
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/GridCacheQueryIndexingDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
index eaf977a..8f03041 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.testframework.*;
@@ -34,8 +35,8 @@ public class GridCacheQueryIndexingDisabledSelfTest extends GridCacheAbstractSel
return 2;
}
- @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.setCacheMode(GridCacheMode.PARTITIONED);
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/GridCacheQueryInternalKeysSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
index 5f658f6..c70d78e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryInternalKeysSelfTest.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.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -52,8 +53,8 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cc = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cc = super.cacheConfiguration(gridName);
cc.setQueryIndexEnabled(false);
cc.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/GridCacheReferenceCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
index 7ea3519..8debe0d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.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.marshaller.optimized.*;
@@ -61,7 +62,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(mode);
cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/GridCacheReloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
index 49810af..4988d90 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
@@ -18,16 +18,16 @@
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.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.lru.*;
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.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -74,7 +74,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(CACHE_NAME);
cacheCfg.setCacheMode(cacheMode);
cacheCfg.setEvictionPolicy(new GridCacheLruEvictionPolicy(MAX_CACHE_ENTRIES));
@@ -84,11 +84,11 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest {
return key;
}
- @Override public void put(Integer key, @Nullable Integer val) {
+ @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) {
//No-op.
}
- @Override public void remove(Integer key) {
+ @Override public void delete(Object key) {
//No-op.
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
index 67bd865..1d9a740 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.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.*;
@@ -67,7 +68,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(GridCacheMode.REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index b6d4aee..5ec15d7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.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.gridgain.grid.cache.*;
import org.gridgain.testframework.junits.common.*;
@@ -54,7 +55,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setBackups(backups);
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/GridCacheSlowTxWarnTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
index 5d8b10b..1956755 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.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.*;
@@ -42,18 +43,18 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc1 = defaultCacheConfiguration();
+ CacheConfiguration cc1 = defaultCacheConfiguration();
cc1.setName("partitioned");
cc1.setCacheMode(PARTITIONED);
cc1.setBackups(1);
- GridCacheConfiguration cc2 = defaultCacheConfiguration();
+ CacheConfiguration cc2 = defaultCacheConfiguration();
cc2.setName("replicated");
cc2.setCacheMode(REPLICATED);
- GridCacheConfiguration cc3 = defaultCacheConfiguration();
+ CacheConfiguration cc3 = defaultCacheConfiguration();
cc3.setName("local");
cc3.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/GridCacheStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java
index 62048ab..0fea61a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.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.spi.discovery.tcp.*;
@@ -57,7 +58,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disc);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setCacheMode(replicated ? REPLICATED : PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java
index b9c046b..a70362b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java
@@ -17,7 +17,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.lang.*;
@@ -30,7 +30,6 @@ import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
-import javax.cache.integration.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -53,7 +52,7 @@ public class GridCacheStorePutxSelfTest 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(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java
index 976bad2..be96a99 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.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.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -30,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
- * Test for {@link GridCacheConfiguration#isStoreValueBytes()}.
+ * Test for {@link org.apache.ignite.cache.CacheConfiguration#isStoreValueBytes()}.
*/
public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest {
/** */
@@ -49,7 +50,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setCacheMode(REPLICATED);
ccfg.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/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java
index 922f92c..eb06167 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.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,7 +60,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
cfg.setNetworkTimeout(2000);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setSwapEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java
index 2880d60..77817fd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java
@@ -17,7 +17,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.*;
@@ -27,14 +27,12 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.spi.swapspace.*;
import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
@@ -66,7 +64,7 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest {
cfg.setSwapSpaceSpi(swap);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(REPLICATED);
cacheCfg.setSwapEnabled(true);
@@ -225,12 +223,12 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Object key, Object val) {
- map.put(key, val);
+ @Override public void write(Cache.Entry<? extends Object, ? extends Object> entry) {
+ map.put(entry.getKey(), entry.getValue());
}
/** {@inheritDoc} */
- @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/GridCacheTtlManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java
index dd15a13..d58fd81 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java
@@ -17,7 +17,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.*;
@@ -54,7 +54,7 @@ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setCacheMode(cacheMode);
ccfg.setEagerTtl(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
index 3d59a8c..f1ae759 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.gridgain.grid.cache.*;
import org.gridgain.testframework.junits.common.*;
@@ -49,8 +50,8 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
* @return Cache configuration.
* @throws Exception If failed.
*/
- protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ 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/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index 1dc2e4f..c780c85 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.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.gridgain.grid.cache.*;
@@ -53,8 +54,8 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
}
/** {@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.setCacheMode(PARTITIONED);
cCfg.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/GridCacheVariableTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java
index d1c6993..0052562 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.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.spi.discovery.tcp.*;
@@ -61,7 +62,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
// 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/GridCacheWriteBehindStoreAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java
index c67048f..c7953e5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java
@@ -126,7 +126,7 @@ public abstract class GridCacheWriteBehindStoreAbstractSelfTest extends GridComm
switch (op) {
case 0:
- store.put(key, "val" + key);
+ store.write(new CacheEntryImpl<>(key, "val" + key));
set.add(key);
operations.incrementAndGet();
@@ -134,7 +134,7 @@ public abstract class GridCacheWriteBehindStoreAbstractSelfTest extends GridComm
break;
case 1:
- store.remove(key);
+ store.delete(key);
set.remove(key);
operations.incrementAndGet();
@@ -143,13 +143,13 @@ public abstract class GridCacheWriteBehindStoreAbstractSelfTest extends GridComm
case 2:
default:
- store.put(key, "broken");
+ store.write(new CacheEntryImpl<>(key, "broken"));
String val = store.load(key);
assertEquals("Invalid intermediate value: " + val, "broken", val);
- store.put(key, "val" + key);
+ store.write(new CacheEntryImpl<>(key, "val" + key));
set.add(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java
index 47112a5..b42cef9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.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.spi.discovery.tcp.*;
@@ -82,7 +83,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(cacheMode());
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
index 9796ead..277a1b4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.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.transactions.*;
import org.gridgain.grid.*;
@@ -63,7 +64,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(GridCacheMode.PARTITIONED);
cc.setWriteBehindEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreSelfTest.java
index b3c8ce7..fc688ce 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreSelfTest.java
@@ -45,8 +45,8 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore
initStore(2);
try {
- store.put(1, "val1");
- store.put(2, "val2");
+ store.write(new CacheEntryImpl<>(1, "val1"));
+ store.write(new CacheEntryImpl<>(2, "val2"));
}
finally {
shutdownStore();
@@ -71,14 +71,14 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore
initStore(2);
try {
- store.put(1, "v1");
- store.put(2, "v2");
+ store.write(new CacheEntryImpl<>(1, "v1"));
+ store.write(new CacheEntryImpl<>(2, "v2"));
assertEquals("v1", store.load(1));
assertEquals("v2", store.load(2));
assertNull(store.load(3));
- store.remove(1);
+ store.delete(1);
assertNull(store.load(1));
assertEquals("v2", store.load(2));
@@ -101,7 +101,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore
try {
for (int i = 0; i < CACHE_SIZE * 2; i++)
- store.put(i, "val" + i);
+ store.write(new CacheEntryImpl<>(i, "val" + i));
U.sleep(200);
@@ -145,11 +145,11 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore
try {
while (running.get()) {
for (int i = 0; i < CACHE_SIZE; i++) {
- store.put(i, "val-0");
+ store.write(new CacheEntryImpl<>(i, "val-0"));
actualPutCnt.incrementAndGet();
- store.put(i, "val" + i);
+ store.write(new CacheEntryImpl<>(i, "val" + i));
actualPutCnt.incrementAndGet();
}
@@ -205,9 +205,9 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore
try {
while (running.get()) {
for (int i = 0; i < CACHE_SIZE; i++) {
- store.put(i, "val-0");
+ store.write(new CacheEntryImpl<>(i, "val-0"));
- store.put(i, "val" + i);
+ store.write(new CacheEntryImpl<>(i, "val" + i));
}
}
}
@@ -251,7 +251,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore
try {
for (int i = 0; i < CACHE_SIZE; i++) {
- store.put(i, "val" + i);
+ store.write(new CacheEntryImpl<>(i, "val" + i));
intList.add(i);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
index 4775d41..c4be689 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
@@ -17,9 +17,9 @@
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.lang.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.indexing.*;
import org.apache.ignite.transactions.*;
@@ -72,8 +72,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
}
/** {@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.setQueryIndexEnabled(true);
ccfg.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/IgniteTxReentryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java
index a16abe0..ca6de17 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.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.*;
@@ -79,7 +80,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract
cfg.setCommunicationSpi(new CountingCommunicationSpi());
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(cacheMode());
cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/IgniteTxStoreExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
index c1448d7..ed1cd4c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.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.*;
@@ -71,8 +72,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
}
/** {@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.setStore(store);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index a1eb7e3..8f7aada 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal.processors.cache.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.datastructures.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.*;
@@ -63,8 +63,8 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr
}
/** {@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/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
index 96501f4..50abe61 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.datastructures;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -83,8 +84,8 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte
}
/** {@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.setBackups(1);
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/GridCacheAtomicLongApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
index 3db1289..2b96140 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.datastructures;
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.*;
@@ -57,7 +58,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration repCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration repCacheCfg = defaultCacheConfiguration();
repCacheCfg.setName("replicated");
repCacheCfg.setCacheMode(REPLICATED);
@@ -67,7 +68,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
repCacheCfg.setAtomicityMode(TRANSACTIONAL);
repCacheCfg.setDistributionMode(NEAR_PARTITIONED);
- GridCacheConfiguration partCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration partCacheCfg = defaultCacheConfiguration();
partCacheCfg.setName("partitioned");
partCacheCfg.setCacheMode(PARTITIONED);
@@ -79,7 +80,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest {
partCacheCfg.setAtomicityMode(TRANSACTIONAL);
partCacheCfg.setDistributionMode(NEAR_PARTITIONED);
- GridCacheConfiguration locCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration locCacheCfg = defaultCacheConfiguration();
locCacheCfg.setName("local");
locCacheCfg.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/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
index aa8809b..f230191 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -68,8 +69,8 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo
/**
* @return Cache configuration for the test.
*/
- protected GridCacheConfiguration getCacheConfiguration() {
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ protected CacheConfiguration getCacheConfiguration() {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
index 0774d1b..d1775aa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.datastructures.*;
import org.gridgain.grid.kernal.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -78,7 +78,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration repCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration repCacheCfg = defaultCacheConfiguration();
repCacheCfg.setName("replicated");
repCacheCfg.setCacheMode(REPLICATED);
@@ -88,7 +88,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
repCacheCfg.setAtomicityMode(TRANSACTIONAL);
repCacheCfg.setDistributionMode(NEAR_PARTITIONED);
- GridCacheConfiguration partCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration partCacheCfg = defaultCacheConfiguration();
partCacheCfg.setName("partitioned");
partCacheCfg.setCacheMode(PARTITIONED);
@@ -100,7 +100,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
partCacheCfg.setAtomicityMode(TRANSACTIONAL);
partCacheCfg.setDistributionMode(NEAR_PARTITIONED);
- GridCacheConfiguration locCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration locCacheCfg = defaultCacheConfiguration();
locCacheCfg.setName("local");
locCacheCfg.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/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index da4caff..fad683b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -55,8 +56,8 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
}
/** {@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.setBackups(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
index cd531f7..090ac29 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
@@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures;
import org.apache.commons.collections.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
@@ -57,7 +58,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
private boolean stopRandomGrid;
/** */
- private GridCacheConfiguration cc = new GridCacheConfiguration();
+ private CacheConfiguration cc = new CacheConfiguration();
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 989f775..1a15b1f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.cache.datastructures;
import junit.framework.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -129,9 +130,9 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
IgniteConfiguration cfg = super.getConfiguration(gridName);
if (cacheMode() == PARTITIONED) {
- GridCacheConfiguration ccfg1 = cacheConfiguration(gridName);
+ CacheConfiguration ccfg1 = cacheConfiguration(gridName);
- GridCacheConfiguration ccfg2 = cacheConfiguration(gridName);
+ CacheConfiguration ccfg2 = cacheConfiguration(gridName);
ccfg2.setName("noBackupsCache");
ccfg2.setBackups(0);
@@ -143,8 +144,8 @@ public abstract class GridCacheSetAbstractSelfTest 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.setPreloadMode(SYNC);
ccfg.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/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
index cb8cbe2..c42fe44 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.kernal.processors.cache.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.datastructures.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -70,8 +70,8 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT
}
/** {@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.setBackups(1);
ccfg.setAtomicWriteOrderMode(PRIMARY);
[10/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
index b62160a..b5ac5c1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.tostring.*;
@@ -56,7 +55,7 @@ import java.util.concurrent.atomic.*;
* </li>
* </ul>
* <p>
- * Cache affinity can be configured for individual caches via {@link GridCacheConfiguration#getAffinity()} method.
+ * Cache affinity can be configured for individual caches via {@link org.apache.ignite.cache.CacheConfiguration#getAffinity()} method.
*/
public class GridCacheConsistentHashAffinityFunction implements GridCacheAffinityFunction {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
index 46c494b..248c1ad 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
@@ -20,7 +20,6 @@ package org.gridgain.grid.cache.affinity.fair;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -32,7 +31,7 @@ import java.util.*;
* Fair affinity function which tries to ensure that all nodes get equal number of partitions with
* minimum amount of reassignments between existing nodes.
* <p>
- * Cache affinity can be configured for individual caches via {@link GridCacheConfiguration#getAffinity()} method.
+ * Cache affinity can be configured for individual caches via {@link org.apache.ignite.cache.CacheConfiguration#getAffinity()} method.
*/
@GridCacheCentralizedAffinityFunction
public class GridCachePartitionFairAffinity implements GridCacheAffinityFunction {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
index cfb1ada..a58bd76 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
@@ -22,8 +22,6 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.util.typedef.*;
@@ -53,7 +51,7 @@ import java.util.*;
* </li>
* </ul>
* <p>
- * Cache affinity can be configured for individual caches via {@link GridCacheConfiguration#getAffinity()} method.
+ * Cache affinity can be configured for individual caches via {@link org.apache.ignite.cache.CacheConfiguration#getAffinity()} method.
*/
public class GridCacheRendezvousAffinityFunction implements GridCacheAffinityFunction, Externalizable {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/cloner/GridCacheCloner.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/cloner/GridCacheCloner.java b/modules/core/src/main/java/org/gridgain/grid/cache/cloner/GridCacheCloner.java
index 256763f..6e82572 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/cloner/GridCacheCloner.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/cloner/GridCacheCloner.java
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.*;
* and will affect the cached values returned to other threads even before
* the transaction commits.
* <p>
- * Cache cloner can be set in cache configuration via {@link GridCacheConfiguration#getCloner()}
+ * Cache cloner can be set in cache configuration via {@link org.apache.ignite.cache.CacheConfiguration#getCloner()}
* method. By default, cache uses {@link GridCacheBasicCloner} implementation
* which will clone only objects implementing {@link Cloneable} interface. You
* can also configure cache to use {@link GridCacheDeepCloner} which will perform
@@ -44,8 +44,8 @@ import org.jetbrains.annotations.*;
*
* @see GridCacheBasicCloner
* @see GridCacheDeepCloner
- * @see GridCacheConfiguration#getCloner()
- * @see GridCacheConfiguration#setCloner(GridCacheCloner)
+ * @see org.apache.ignite.cache.CacheConfiguration#getCloner()
+ * @see org.apache.ignite.cache.CacheConfiguration#setCloner(GridCacheCloner)
*
*/
public interface GridCacheCloner {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
index 3d283f7..a280426 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
@@ -25,7 +25,7 @@ import org.gridgain.grid.cache.*;
* If {@link #evictAllowed(GridCacheEntry)} method returns {@code false} then eviction
* policy will not be notified and entry will never be evicted.
* <p>
- * Eviction filter can be configured via {@link GridCacheConfiguration#getEvictionFilter()}
+ * Eviction filter can be configured via {@link org.apache.ignite.cache.CacheConfiguration#getEvictionFilter()}
* configuration property. Default value is {@code null} which means that all
* cache entries will be tracked by eviction policy.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
index 830d0e2..7838a73 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
@@ -18,7 +18,7 @@
package org.gridgain.grid.cache.eviction.fifo;
import org.apache.ignite.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.*;
import org.jdk8.backport.*;
@@ -42,7 +42,7 @@ public class GridCacheFifoEvictionPolicy<K, V> implements GridCacheEvictionPolic
private final String meta = UUID.randomUUID().toString();
/** Maximum size. */
- private volatile int max = GridCacheConfiguration.DFLT_CACHE_SIZE;
+ private volatile int max = CacheConfiguration.DFLT_CACHE_SIZE;
/** FIFO queue. */
private final ConcurrentLinkedDeque8<GridCacheEntry<K, V>> queue =
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/lru/GridCacheLruEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/lru/GridCacheLruEvictionPolicy.java b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/lru/GridCacheLruEvictionPolicy.java
index 1f01324..3535221 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/lru/GridCacheLruEvictionPolicy.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/lru/GridCacheLruEvictionPolicy.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.cache.eviction.lru;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.*;
import org.jdk8.backport.*;
@@ -37,7 +38,7 @@ public class GridCacheLruEvictionPolicy<K, V> implements GridCacheEvictionPolicy
private final String meta = UUID.randomUUID().toString();
/** Maximum size. */
- private volatile int max = GridCacheConfiguration.DFLT_CACHE_SIZE;
+ private volatile int max = CacheConfiguration.DFLT_CACHE_SIZE;
/** Queue. */
private final ConcurrentLinkedDeque8<GridCacheEntry<K, V>> queue =
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/random/GridCacheRandomEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/random/GridCacheRandomEvictionPolicy.java b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/random/GridCacheRandomEvictionPolicy.java
index a2ed65c..f49531f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/random/GridCacheRandomEvictionPolicy.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/random/GridCacheRandomEvictionPolicy.java
@@ -18,7 +18,7 @@
package org.gridgain.grid.cache.eviction.random;
import org.apache.ignite.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.*;
import org.gridgain.grid.util.typedef.*;
@@ -38,7 +38,7 @@ import static org.gridgain.grid.cache.GridCachePeekMode.*;
public class GridCacheRandomEvictionPolicy<K, V> implements GridCacheEvictionPolicy<K, V>,
GridCacheRandomEvictionPolicyMBean {
/** Maximum size. */
- private volatile int max = GridCacheConfiguration.DFLT_CACHE_SIZE;
+ private volatile int max = CacheConfiguration.DFLT_CACHE_SIZE;
/**
* Constructs random eviction policy with all defaults.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 3085f3b..1afb7b2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -35,7 +36,6 @@ import org.apache.ignite.spi.indexing.*;
import org.apache.ignite.streamer.*;
import org.apache.ignite.thread.*;
import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.rendezvous.*;
import org.gridgain.grid.kernal.processors.interop.*;
import org.gridgain.grid.kernal.processors.resource.*;
@@ -1111,7 +1111,7 @@ public class GridGainEx {
private static final String[] EMPTY_STR_ARR = new String[0];
/** Empty array of caches. */
- private static final GridCacheConfiguration[] EMPTY_CACHE_CONFIGS = new GridCacheConfiguration[0];
+ private static final CacheConfiguration[] EMPTY_CACHE_CONFIGS = new CacheConfiguration[0];
/** Grid name. */
private final String name;
@@ -1715,10 +1715,10 @@ public class GridGainEx {
if (swapspaceSpi == null) {
boolean needSwap = false;
- GridCacheConfiguration[] caches = cfg.getCacheConfiguration();
+ CacheConfiguration[] caches = cfg.getCacheConfiguration();
if (caches != null) {
- for (GridCacheConfiguration c : caches) {
+ for (CacheConfiguration c : caches) {
if (c.isSwapEnabled()) {
needSwap = true;
@@ -1816,11 +1816,11 @@ public class GridGainEx {
if (adminEmails != null)
myCfg.setAdminEmails(adminEmails.split(","));
- GridCacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
+ CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
boolean hasHadoop = GridComponentType.HADOOP.inClassPath();
- GridCacheConfiguration[] copies;
+ CacheConfiguration[] copies;
if (cacheCfgs != null && cacheCfgs.length > 0) {
if (!U.discoOrdered(discoSpi) && !U.relaxDiscoveryOrdered())
@@ -1828,7 +1828,7 @@ public class GridGainEx {
"cannot be used with cache (use SPI with @GridDiscoverySpiOrderSupport annotation, " +
"like GridTcpDiscoverySpi)");
- for (GridCacheConfiguration ccfg : cacheCfgs) {
+ for (CacheConfiguration ccfg : cacheCfgs) {
if (CU.isHadoopSystemCache(ccfg.getName()))
throw new IgniteCheckedException("Cache name cannot be \"" + CU.SYS_CACHE_HADOOP_MR +
"\" because it is reserved for internal purposes.");
@@ -1838,24 +1838,24 @@ public class GridGainEx {
"\" because this prefix is reserved for internal purposes.");
}
- copies = new GridCacheConfiguration[cacheCfgs.length + (hasHadoop ? 2 : 1)];
+ copies = new CacheConfiguration[cacheCfgs.length + (hasHadoop ? 2 : 1)];
int cloneIdx = 1;
if (hasHadoop)
copies[cloneIdx++] = CU.hadoopSystemCache();
- for (GridCacheConfiguration ccfg : cacheCfgs)
- copies[cloneIdx++] = new GridCacheConfiguration(ccfg);
+ for (CacheConfiguration ccfg : cacheCfgs)
+ copies[cloneIdx++] = new CacheConfiguration(ccfg);
}
else if (hasHadoop) {
// Populate system caches
- copies = new GridCacheConfiguration[hasHadoop ? 2 : 1];
+ copies = new CacheConfiguration[hasHadoop ? 2 : 1];
copies[1] = CU.hadoopSystemCache();
}
else
- copies = new GridCacheConfiguration[1];
+ copies = new CacheConfiguration[1];
// Always add utility cache.
copies[0] = utilitySystemCache(discoSpi instanceof TcpClientDiscoverySpi);
@@ -2031,8 +2031,8 @@ public class GridGainEx {
*
* @return Utility system cache configuration.
*/
- private GridCacheConfiguration utilitySystemCache(boolean client) {
- GridCacheConfiguration cache = new GridCacheConfiguration();
+ private CacheConfiguration utilitySystemCache(boolean client) {
+ CacheConfiguration cache = new CacheConfiguration();
cache.setName(CU.UTILITY_CACHE_NAME);
cache.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index f54d1e5..2e71ca6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -2283,14 +2284,14 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
*
*/
private void ackCacheConfiguration() {
- GridCacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
+ CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
if (cacheCfgs == null || cacheCfgs.length == 0)
U.warn(log, "Cache is not configured - in-memory data grid is off.");
else {
SB sb = new SB();
- for (GridCacheConfiguration c : cacheCfgs) {
+ for (CacheConfiguration c : cacheCfgs) {
String name = c.getName();
if (name == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 1a31edd..2275c88 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.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.*;
@@ -139,7 +140,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
/** Cache configuration. */
@GridToStringExclude
- protected GridCacheConfiguration cacheCfg;
+ protected CacheConfiguration cacheCfg;
/** Grid configuration. */
@GridToStringExclude
@@ -529,7 +530,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
/** {@inheritDoc} */
- @Override public GridCacheConfiguration configuration() {
+ @Override public CacheConfiguration configuration() {
return ctx.config();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAttributes.java
index 84ac35a..906ed53 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAttributes.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
@@ -25,7 +26,7 @@ import org.jetbrains.annotations.*;
import java.io.*;
-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.*;
@@ -155,7 +156,7 @@ public class GridCacheAttributes implements Externalizable {
/**
* @param cfg Cache configuration.
*/
- public GridCacheAttributes(GridCacheConfiguration cfg) {
+ public GridCacheAttributes(CacheConfiguration cfg) {
atomicityMode = cfg.getAtomicityMode();
cacheMode = cfg.getCacheMode();
dfltLockTimeout = cfg.getDefaultLockTimeout();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
index 11adb67..2a5988f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.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.*;
@@ -94,7 +95,7 @@ public class GridCacheContext<K, V> implements Externalizable {
private IgniteLogger log;
/** Cache configuration. */
- private GridCacheConfiguration cacheCfg;
+ private CacheConfiguration cacheCfg;
/** Unsafe memory object for direct memory allocation. */
private GridUnsafeMemory unsafeMemory;
@@ -213,7 +214,7 @@ public class GridCacheContext<K, V> implements Externalizable {
public GridCacheContext(
GridKernalContext ctx,
GridCacheSharedContext sharedCtx,
- GridCacheConfiguration cacheCfg,
+ CacheConfiguration cacheCfg,
/*
* Managers in starting order!
@@ -774,7 +775,7 @@ public class GridCacheContext<K, V> implements Externalizable {
/**
* @return Cache configuration for given cache instance.
*/
- public GridCacheConfiguration config() {
+ public CacheConfiguration config() {
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
index efcb798..bcf4ee2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
@@ -20,8 +20,6 @@ package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.portables.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.typedef.*;
@@ -39,7 +37,7 @@ import java.lang.reflect.*;
* conjunction with this mapper to automatically provide custom affinity keys for cache keys.
* <p>
* If non-default affinity mapper is used, is should be provided via
- * {@link GridCacheConfiguration#getAffinityMapper()} configuration property.
+ * {@link org.apache.ignite.cache.CacheConfiguration#getAffinityMapper()} configuration property.
*/
public class GridCacheDefaultAffinityKeyMapper implements GridCacheAffinityKeyMapper {
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
index d05a347..6c2630a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.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.events.*;
import org.apache.ignite.lang.*;
@@ -127,7 +128,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
- GridCacheConfiguration cfg = cctx.config();
+ CacheConfiguration cfg = cctx.config();
plc = cctx.isNear() ? cfg.<K, V>getNearEvictionPolicy() : cfg.<K, V>getEvictionPolicy();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
index 2602510..1eec684 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.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.*;
@@ -59,7 +60,7 @@ import java.util.*;
import static org.apache.ignite.IgniteSystemProperties.*;
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.GridCacheDistributionMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCachePreloadMode.*;
@@ -131,7 +132,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param cfg Initializes cache configuration with proper defaults.
*/
@SuppressWarnings("unchecked")
- private void initialize(GridCacheConfiguration cfg) {
+ private void initialize(CacheConfiguration cfg) {
if (cfg.getCacheMode() == null)
cfg.setCacheMode(DFLT_CACHE_MODE);
@@ -242,7 +243,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/**
* @param cfg Configuration to check for possible performance issues.
*/
- private void suggestOptimizations(GridCacheConfiguration cfg) {
+ private void suggestOptimizations(CacheConfiguration cfg) {
GridPerformanceSuggestions perf = ctx.performance();
String msg = "Disable eviction policy (remove from configuration)";
@@ -287,7 +288,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param cc Configuration to validate.
* @throws IgniteCheckedException If failed.
*/
- private void validate(IgniteConfiguration c, GridCacheConfiguration cc) throws IgniteCheckedException {
+ private void validate(IgniteConfiguration c, CacheConfiguration cc) throws IgniteCheckedException {
if (cc.getCacheMode() == REPLICATED) {
if (cc.getAffinity() instanceof GridCachePartitionFairAffinity)
throw new IgniteCheckedException("REPLICATED cache can not be started with GridCachePartitionFairAffinity" +
@@ -463,7 +464,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param objs Extra components.
* @throws IgniteCheckedException If failed to inject.
*/
- private void prepare(GridCacheConfiguration cfg, Object... objs) throws IgniteCheckedException {
+ private void prepare(CacheConfiguration cfg, Object... objs) throws IgniteCheckedException {
prepare(cfg, cfg.getEvictionPolicy(), false);
prepare(cfg, cfg.getNearEvictionPolicy(), true);
prepare(cfg, cfg.getAffinity(), false);
@@ -483,7 +484,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param near Near flag.
* @throws IgniteCheckedException If failed.
*/
- private void prepare(GridCacheConfiguration cfg, @Nullable Object rsrc, boolean near) throws IgniteCheckedException {
+ private void prepare(CacheConfiguration cfg, @Nullable Object rsrc, boolean near) throws IgniteCheckedException {
if (rsrc != null) {
ctx.resource().injectGeneric(rsrc);
@@ -497,7 +498,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param cctx Cache context.
*/
private void cleanup(GridCacheContext cctx) {
- GridCacheConfiguration cfg = cctx.config();
+ CacheConfiguration cfg = cctx.config();
cleanup(cfg, cfg.getEvictionPolicy(), false);
cleanup(cfg, cfg.getNearEvictionPolicy(), true);
@@ -515,7 +516,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param rsrc Resource.
* @param near Near flag.
*/
- private void cleanup(GridCacheConfiguration cfg, @Nullable Object rsrc, boolean near) {
+ private void cleanup(CacheConfiguration cfg, @Nullable Object rsrc, boolean near) {
if (rsrc != null) {
unregisterMbean(rsrc, cfg.getName(), near);
@@ -560,7 +561,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
sysCaches.add(CU.UTILITY_CACHE_NAME);
- GridCacheConfiguration[] cfgs = ctx.config().getCacheConfiguration();
+ CacheConfiguration[] cfgs = ctx.config().getCacheConfiguration();
sharedCtx = createSharedContext(ctx);
@@ -570,7 +571,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
Collection<GridCacheAdapter<?, ?>> startSeq = new ArrayList<>(cfgs.length);
for (int i = 0; i < cfgs.length; i++) {
- GridCacheConfiguration cfg = new GridCacheConfiguration(cfgs[i]);
+ CacheConfiguration cfg = new CacheConfiguration(cfgs[i]);
// Initialize defaults.
initialize(cfg);
@@ -818,7 +819,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
for (GridCacheAdapter<?, ?> cache : startSeq) {
GridCacheContext<?, ?> cacheCtx = cache.context();
- GridCacheConfiguration cfg = cacheCtx.config();
+ CacheConfiguration cfg = cacheCtx.config();
// Start managers.
for (GridCacheManager mgr : F.view(cacheCtx.managers(), F.notContains(dhtExcludes(cacheCtx))))
@@ -921,7 +922,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
int i = 0;
- for (GridCacheConfiguration cfg : ctx.config().getCacheConfiguration()) {
+ for (CacheConfiguration cfg : ctx.config().getCacheConfiguration()) {
attrVals[i++] = new GridCacheAttributes(cfg);
attrPortable.put(CU.mask(cfg.getName()), cfg.isPortableEnabled());
@@ -947,10 +948,10 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @return Maximum detected preload order.
* @throws IgniteCheckedException If validation failed.
*/
- private int validatePreloadOrder(GridCacheConfiguration[] cfgs) throws IgniteCheckedException {
+ private int validatePreloadOrder(CacheConfiguration[] cfgs) throws IgniteCheckedException {
int maxOrder = 0;
- for (GridCacheConfiguration cfg : cfgs) {
+ for (CacheConfiguration cfg : cfgs) {
int preloadOrder = cfg.getPreloadOrder();
if (preloadOrder > 0) {
@@ -984,7 +985,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
*/
@Nullable private IgniteSpiNodeValidationResult validateHashIdResolvers(ClusterNode node) {
for (GridCacheAdapter cache : ctx.cache().internalCaches()) {
- GridCacheConfiguration cfg = cache.configuration();
+ CacheConfiguration cfg = cache.configuration();
if (cfg.getAffinity() instanceof GridCacheConsistentHashAffinityFunction) {
GridCacheConsistentHashAffinityFunction aff = (GridCacheConsistentHashAffinityFunction)cfg.getAffinity();
@@ -1286,7 +1287,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
GridCacheAdapter cache = e.getValue();
if (maxPreloadOrder > 0) {
- GridCacheConfiguration cfg = cache.configuration();
+ CacheConfiguration cfg = cache.configuration();
int order = cfg.getPreloadOrder();
@@ -1316,7 +1317,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
// Wait for caches in SYNC preload mode.
for (GridCacheAdapter<?, ?> cache : caches.values()) {
- GridCacheConfiguration cfg = cache.configuration();
+ CacheConfiguration cfg = cache.configuration();
if (cfg.getPreloadMode() == SYNC) {
if (cfg.getCacheMode() == REPLICATED ||
@@ -1505,7 +1506,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param cfg Cache configuration.
* @return Query manager.
*/
- private GridCacheQueryManager queryManager(GridCacheConfiguration cfg) {
+ private GridCacheQueryManager queryManager(CacheConfiguration cfg) {
return cfg.getCacheMode() == LOCAL ? new GridCacheLocalQueryManager() : new GridCacheDistributedQueryManager();
}
@@ -1811,7 +1812,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* or user-defined cache store.
*/
@SuppressWarnings({"unchecked"})
- private CacheStore cacheStore(String gridName, GridCacheConfiguration cfg) {
+ private CacheStore cacheStore(String gridName, CacheConfiguration cfg) {
if (cfg.getStore() == null || !cfg.isWriteBehindEnabled())
return cfg.getStore();
@@ -1831,7 +1832,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param objs Extra components.
* @return Components provided in cache configuration which can implement {@link LifecycleAware} interface.
*/
- private Iterable<Object> lifecycleAwares(GridCacheConfiguration ccfg, Object...objs) {
+ private Iterable<Object> lifecycleAwares(CacheConfiguration ccfg, Object...objs) {
Collection<Object> ret = new ArrayList<>(7 + objs.length);
ret.add(ccfg.getAffinity());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
index ac13deb..7991433 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.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.lang.*;
import org.apache.ignite.transactions.*;
@@ -154,7 +155,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public GridCacheConfiguration configuration() {
+ @Override public CacheConfiguration configuration() {
return cache.configuration();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
index e943a11..f08dcb5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
@@ -23,13 +23,13 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.transactions.*;
+import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.interop.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
-import sun.nio.cs.*;
import javax.cache.*;
import java.util.*;
@@ -246,19 +246,21 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
try {
if (keys.size() > singleThreadGate.loadAllThreshold()) {
- Map<K, Object> map = singleThreadGate.loadAll(keys0);
+ Map<K, Object> map = store.loadAll(keys0);
- for (Map.Entry<K, Object> e : map.entrySet()) {
- K k = e.getKey();
+ if (map != null) {
+ for (Map.Entry<K, Object> e : map.entrySet()) {
+ K k = e.getKey();
- V v = convert(e.getValue());
+ V v = convert(e.getValue());
- if (cctx.portableEnabled()) {
- k = (K)cctx.marshalToPortable(k);
- v = (V)cctx.marshalToPortable(v);
- }
+ if (cctx.portableEnabled()) {
+ k = (K)cctx.marshalToPortable(k);
+ v = (V)cctx.marshalToPortable(v);
+ }
- vis.apply(k, v);
+ vis.apply(k, v);
+ }
}
}
else {
@@ -591,7 +593,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
if (ses) {
sesHolder.set(null);
- tx.removeMeta(SES_ATTR);
+ ((GridMetadataAware)tx).removeMeta(SES_ATTR);
}
}
}
@@ -620,12 +622,12 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
if (!sesEnabled || tx == null)
return false;
- SessionData ses = tx.meta(SES_ATTR);
+ SessionData ses = ((GridMetadataAware)tx).meta(SES_ATTR);
if (ses == null) {
ses = new SessionData(tx);
- tx.addMeta(SES_ATTR, ses);
+ ((GridMetadataAware)tx).addMeta(SES_ATTR, ses);
}
sesHolder.set(ses);
@@ -680,10 +682,11 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public Map<Object, Object> properties() {
+ @SuppressWarnings("unchecked")
+ @Override public <K, V> Map<K, V> properties() {
SessionData ses0 = sesHolder.get();
- return ses0 != null ? ses0.properties() : null;
+ return ses0 != null ? (Map<K, V>)ses0.properties() : null;
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManager.java
index 20791e2..d8785e9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManager.java
@@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.thread.*;
import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -29,7 +28,7 @@ import org.gridgain.grid.util.worker.*;
import java.util.*;
/**
- * Eagerly removes expired entries from cache when {@link GridCacheConfiguration#isEagerTtl()} flag is set.
+ * Eagerly removes expired entries from cache when {@link org.apache.ignite.cache.CacheConfiguration#isEagerTtl()} flag is set.
*/
@SuppressWarnings("NakedNotify")
public class GridCacheTtlManager<K, V> extends GridCacheManagerAdapter<K, V> {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
index cf10e91..7452e2f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.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.fs.*;
@@ -564,7 +565,7 @@ public class GridCacheUtils {
* @param cfg Configuration to check.
* @return {@code True} if local node is affinity node (i.e. will store partitions).
*/
- public static boolean isAffinityNode(GridCacheConfiguration cfg) {
+ public static boolean isAffinityNode(CacheConfiguration cfg) {
if (cfg.getCacheMode() == LOCAL)
return true;
@@ -641,7 +642,7 @@ public class GridCacheUtils {
* @return {@code True} if near cache is enabled, {@code false} otherwise.
*/
@SuppressWarnings("SimplifiableIfStatement")
- public static boolean isNearEnabled(GridCacheConfiguration cfg) {
+ public static boolean isNearEnabled(CacheConfiguration cfg) {
if (cfg.getCacheMode() == LOCAL)
return false;
@@ -655,7 +656,7 @@ public class GridCacheUtils {
* @param cfg Configuration.
* @return Partitioned cache mode.
*/
- public static GridCacheDistributionMode distributionMode(GridCacheConfiguration cfg) {
+ public static GridCacheDistributionMode distributionMode(CacheConfiguration cfg) {
return cfg.getDistributionMode() != null ?
cfg.getDistributionMode() : GridCacheDistributionMode.PARTITIONED_ONLY;
}
@@ -1279,7 +1280,7 @@ public class GridCacheUtils {
assert ctx != null;
assert key != null;
- GridCacheConfiguration cfg = ctx.cache().configuration();
+ CacheConfiguration cfg = ctx.cache().configuration();
if (cfg.getCacheMode() != PARTITIONED)
return ctx.localNode();
@@ -1387,8 +1388,8 @@ public class GridCacheUtils {
* @param fail If true throws IgniteCheckedException in case of attribute values mismatch, otherwise logs warning.
* @throws IgniteCheckedException If attribute values are different and fail flag is true.
*/
- public static void checkAttributeMismatch(IgniteLogger log, GridCacheConfiguration locCfg,
- GridCacheConfiguration rmtCfg, ClusterNode rmt, T2<String, String> attr, boolean fail) throws IgniteCheckedException {
+ public static void checkAttributeMismatch(IgniteLogger log, CacheConfiguration locCfg,
+ CacheConfiguration rmtCfg, ClusterNode rmt, T2<String, String> attr, boolean fail) throws IgniteCheckedException {
assert rmt != null;
assert attr != null;
assert attr.get1() != null;
@@ -1494,8 +1495,8 @@ public class GridCacheUtils {
*
* @return Hadoop cache configuration.
*/
- public static GridCacheConfiguration hadoopSystemCache() {
- GridCacheConfiguration cache = new GridCacheConfiguration();
+ public static CacheConfiguration hadoopSystemCache() {
+ CacheConfiguration cache = new CacheConfiguration();
cache.setName(CU.SYS_CACHE_HADOOP_MR);
cache.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
index fea67a9..d680144 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.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.lang.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.thread.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -40,6 +40,8 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
+import static javax.cache.Cache.Entry;
+
/**
* Internal wrapper for a {@link org.apache.ignite.cache.store.CacheStore} that enables write-behind logic.
* <p/>
@@ -73,19 +75,19 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
private int concurLvl = DFLT_CONCUR_LVL;
/** When cache size exceeds this value eldest entry will be stored to the underlying store. */
- private int cacheMaxSize = GridCacheConfiguration.DFLT_WRITE_BEHIND_FLUSH_SIZE;
+ private int cacheMaxSize = CacheConfiguration.DFLT_WRITE_BEHIND_FLUSH_SIZE;
/** Critical cache size. If cache size exceeds this value, data flush performed synchronously. */
private int cacheCriticalSize;
/** Count of worker threads performing underlying store updates. */
- private int flushThreadCnt = GridCacheConfiguration.DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT;
+ private int flushThreadCnt = CacheConfiguration.DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT;
/** Cache flush frequency. All pending operations will be performed in not less then this value ms. */
- private long cacheFlushFreq = GridCacheConfiguration.DFLT_WRITE_BEHIND_FLUSH_FREQUENCY;
+ private long cacheFlushFreq = CacheConfiguration.DFLT_WRITE_BEHIND_FLUSH_FREQUENCY;
/** Maximum batch size for put and remove operations */
- private int batchSize = GridCacheConfiguration.DFLT_WRITE_BEHIND_BATCH_SIZE;
+ private int batchSize = CacheConfiguration.DFLT_WRITE_BEHIND_BATCH_SIZE;
/** Grid name. */
private String gridName;
@@ -97,7 +99,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
private CacheStore<K, V> store;
/** Write cache. */
- private ConcurrentLinkedHashMap<K, StatefulValue<V>> writeCache;
+ private ConcurrentLinkedHashMap<K, StatefulValue<K, V>> writeCache;
/** Flusher threads. */
private GridWorker[] flushThreads;
@@ -158,7 +160,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
* <p/>
* If this value is {@code 0}, then flush is performed only on time-elapsing basis. However,
* when this value is {@code 0}, the cache critical size is set to
- * {@link GridCacheConfiguration#DFLT_WRITE_BEHIND_CRITICAL_SIZE}
+ * {@link org.apache.ignite.cache.CacheConfiguration#DFLT_WRITE_BEHIND_CRITICAL_SIZE}
*
* @return Buffer size that triggers flush procedure.
*/
@@ -275,7 +277,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
cacheCriticalSize = (int)(cacheMaxSize * CACHE_OVERFLOW_RATIO);
if (cacheCriticalSize == 0)
- cacheCriticalSize = GridCacheConfiguration.DFLT_WRITE_BEHIND_CRITICAL_SIZE;
+ cacheCriticalSize = CacheConfiguration.DFLT_WRITE_BEHIND_CRITICAL_SIZE;
flushThreads = new GridWorker[flushThreadCnt];
@@ -384,34 +386,25 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
}
/** {@inheritDoc} */
- @SuppressWarnings({"NullableProblems"})
- @Override public void loadAll(@Nullable Collection<? extends K> keys, IgniteBiInClosure<K, V> c) {
+ @Override public Map<K, V> loadAll(Iterable<? extends K> keys) {
if (log.isDebugEnabled())
log.debug("Store load all [keys=" + keys + ']');
+ Map<K, V> loaded = new HashMap<>();
+
Collection<K> remaining = new LinkedList<>();
for (K key : keys) {
- StatefulValue<V> val = writeCache.get(key);
+ StatefulValue<K, V> val = writeCache.get(key);
if (val != null) {
val.readLock().lock();
try {
- switch (val.operation()) {
- case PUT:
- c.apply(key, val.value());
-
- break;
-
- case RMV:
- c.apply(key, null);
-
- break;
-
- default:
- assert false : "Unexpected operation: " + val.status();
- }
+ if (val.operation() == StoreOperation.PUT)
+ loaded.put(key, val.entry().getValue());
+ else
+ assert val.operation() == StoreOperation.RMV : val.operation();
}
finally {
val.readLock().unlock();
@@ -422,8 +415,14 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
}
// For items that were not found in queue.
- if (!remaining.isEmpty())
- store.loadAll(remaining, c);
+ if (!remaining.isEmpty()) {
+ Map<K, V> loaded0 = store.loadAll(remaining);
+
+ if (loaded0 != null)
+ loaded.putAll(loaded0);
+ }
+
+ return loaded;
}
/** {@inheritDoc} */
@@ -431,7 +430,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
if (log.isDebugEnabled())
log.debug("Store load [key=" + key + ']');
- StatefulValue<V> val = writeCache.get(key);
+ StatefulValue<K, V> val = writeCache.get(key);
if (val != null) {
val.readLock().lock();
@@ -439,7 +438,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
try {
switch (val.operation()) {
case PUT:
- return val.value();
+ return val.entry().getValue();
case RMV:
return null;
@@ -457,18 +456,18 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
}
/** {@inheritDoc} */
- @Override public void putAll(Map<? extends K, ? extends V> map) {
- for (Map.Entry<? extends K, ? extends V> e : map.entrySet())
- put(e.getKey(), e.getValue());
+ @Override public void writeAll(Collection<Entry<? extends K, ? extends V>> entries) {
+ for (Entry<? extends K, ? extends V> e : entries)
+ write(e);
}
/** {@inheritDoc} */
- @Override public void put(K key, V val) {
+ @Override public void write(Entry<? extends K, ? extends V> entry) {
try {
if (log.isDebugEnabled())
- log.debug("Store put [key=" + key + ", val=" + val + ']');
+ log.debug("Store put [key=" + entry.getKey() + ", val=" + entry.getValue() + ']');
- updateCache(key, val, StoreOperation.PUT);
+ updateCache(entry.getKey(), entry, StoreOperation.PUT);
}
catch (GridInterruptedException e) {
throw new CacheWriterException(e);
@@ -476,18 +475,19 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
}
/** {@inheritDoc} */
- @Override public void removeAll(Collection<? extends K> keys) {
- for (K key : keys)
- remove(key);
+ @Override public void deleteAll(Collection<?> keys) {
+ for (Object key : keys)
+ delete(key);
}
/** {@inheritDoc} */
- @Override public void remove(K key) {
+ @SuppressWarnings("unchecked")
+ @Override public void delete(Object key) {
try {
if (log.isDebugEnabled())
log.debug("Store remove [key=" + key + ']');
- updateCache(key, null, StoreOperation.RMV);
+ updateCache((K)key, null, StoreOperation.RMV);
}
catch (GridInterruptedException e) {
throw new CacheWriterException(e);
@@ -512,10 +512,13 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
* @param operation Updated value status
* @throws GridInterruptedException If interrupted while waiting for value to be flushed.
*/
- private void updateCache(K key, @Nullable V val, StoreOperation operation) throws GridInterruptedException {
- StatefulValue<V> newVal = new StatefulValue<>(val, operation);
+ private void updateCache(K key,
+ @Nullable Entry<? extends K, ? extends V> val,
+ StoreOperation operation)
+ throws GridInterruptedException {
+ StatefulValue<K, V> newVal = new StatefulValue<>(val, operation);
- StatefulValue<V> prev;
+ StatefulValue<K, V> prev;
while ((prev = writeCache.putIfAbsent(key, newVal)) != null) {
prev.writeLock().lock();
@@ -555,17 +558,17 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
/**
* Flushes one upcoming value to the underlying store. Called from
- * {@link #updateCache(Object, Object, StoreOperation)} method in case when current map size exceeds
+ * {@link #updateCache(Object, Entry, StoreOperation)} method in case when current map size exceeds
* critical size.
*/
private void flushSingleValue() {
cacheOverflowCntr.incrementAndGet();
try {
- Map<K, StatefulValue<V>> batch = null;
+ Map<K, StatefulValue<K, V>> batch = null;
- for (Map.Entry<K, StatefulValue<V>> e : writeCache.entrySet()) {
- StatefulValue<V> val = e.getValue();
+ for (Map.Entry<K, StatefulValue<K, V>> e : writeCache.entrySet()) {
+ StatefulValue<K, V> val = e.getValue();
val.writeLock().lock();
@@ -589,7 +592,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
val.writeLock().unlock();
}
- if (batch != null && !batch.isEmpty()) {
+ if (!batch.isEmpty()) {
applyBatch(batch);
cacheTotalOverflowCntr.incrementAndGet();
@@ -608,15 +611,15 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
*
* @param valMap Batch map.
*/
- private void applyBatch(Map<K, StatefulValue<V>> valMap) {
+ private void applyBatch(Map<K, StatefulValue<K, V>> valMap) {
assert valMap.size() <= batchSize;
StoreOperation operation = null;
// Construct a map for underlying store
- Map<K, V> batch = U.newLinkedHashMap(valMap.size());
+ Map<K, Entry<? extends K, ? extends V>> batch = U.newLinkedHashMap(valMap.size());
- for (Map.Entry<K, StatefulValue<V>> e : valMap.entrySet()) {
+ for (Map.Entry<K, StatefulValue<K, V>> e : valMap.entrySet()) {
if (operation == null)
operation = e.getValue().operation();
@@ -624,19 +627,19 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
assert e.getValue().status() == ValueStatus.PENDING;
- batch.put(e.getKey(), e.getValue().value());
+ batch.put(e.getKey(), e.getValue().entry());
}
if (updateStore(operation, batch)) {
- for (Map.Entry<K, StatefulValue<V>> e : valMap.entrySet()) {
- StatefulValue<V> val = e.getValue();
+ for (Map.Entry<K, StatefulValue<K, V>> e : valMap.entrySet()) {
+ StatefulValue<K, V> val = e.getValue();
val.writeLock().lock();
try {
val.status(ValueStatus.FLUSHED);
- StatefulValue<V> prev = writeCache.remove(e.getKey());
+ StatefulValue<K, V> prev = writeCache.remove(e.getKey());
// Additional check to ensure consistency.
assert prev == val : "Map value for key " + e.getKey() + " was updated during flush";
@@ -650,7 +653,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
}
else {
// Exception occurred, we must set RETRY status
- for (StatefulValue<V> val : valMap.values()) {
+ for (StatefulValue<K, V> val : valMap.values()) {
val.writeLock().lock();
try {
@@ -680,16 +683,16 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
* @return {@code true} if value may be deleted from the write cache,
* {@code false} otherwise
*/
- private boolean updateStore(StoreOperation operation, Map<K, V> vals) {
+ private boolean updateStore(StoreOperation operation, Map<K, Entry<? extends K, ? extends V>> vals) {
try {
switch (operation) {
case PUT:
- store.putAll(vals);
+ store.writeAll(vals.values());
break;
case RMV:
- store.removeAll(vals.keySet());
+ store.deleteAll(vals.keySet());
break;
@@ -703,10 +706,13 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
LT.warn(log, e, "Unable to update underlying store: " + store);
if (writeCache.sizex() > cacheCriticalSize || stopping.get()) {
- for (Map.Entry<K, V> entry : vals.entrySet())
+ for (Map.Entry<K, Entry<? extends K, ? extends V>> entry : vals.entrySet()) {
+ Object val = entry.getValue() != null ? entry.getValue().getValue() : null;
+
log.warning("Failed to update store (value will be lost as current buffer size is greater " +
"than 'cacheCriticalSize' or node has been stopped before store was repaired) [key=" +
- entry.getKey() + ", val=" + entry.getValue() + ", op=" + operation + "]");
+ entry.getKey() + ", val=" + val + ", op=" + operation + "]");
+ }
return true;
}
@@ -777,16 +783,16 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
*
* @param it Iterator for write cache.
*/
- private void flushCache(Iterator<Map.Entry<K,StatefulValue<V>>> it) {
+ private void flushCache(Iterator<Map.Entry<K,StatefulValue<K, V>>> it) {
StoreOperation operation = null;
- Map<K, StatefulValue<V>> batch = null;
- Map<K, StatefulValue<V>> pending = U.newLinkedHashMap(batchSize);
+ Map<K, StatefulValue<K, V>> batch = null;
+ Map<K, StatefulValue<K, V>> pending = U.newLinkedHashMap(batchSize);
while (it.hasNext()) {
- Map.Entry<K, StatefulValue<V>> e = it.next();
+ Map.Entry<K, StatefulValue<K, V>> e = it.next();
- StatefulValue<V> val = e.getValue();
+ StatefulValue<K, V> val = e.getValue();
val.writeLock().lock();
@@ -848,7 +854,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
*
* @return Write cache for the underlying store operations.
*/
- Map<K, StatefulValue<V>> writeCache() {
+ Map<K, StatefulValue<K, V>> writeCache() {
return writeCache;
}
@@ -895,13 +901,13 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
*
* @param <V> Value type.
*/
- private static class StatefulValue<V> extends ReentrantReadWriteLock {
+ private static class StatefulValue<K, V> extends ReentrantReadWriteLock {
/** */
private static final long serialVersionUID = 0L;
/** Value. */
@GridToStringInclude
- private V val;
+ private Entry<? extends K, ? extends V> val;
/** Store operation. */
private StoreOperation storeOperation;
@@ -918,7 +924,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
* @param val Value.
* @param storeOperation Store operation.
*/
- private StatefulValue(V val, StoreOperation storeOperation) {
+ private StatefulValue(Entry<? extends K, ? extends V> val, StoreOperation storeOperation) {
assert storeOperation == StoreOperation.PUT || storeOperation == StoreOperation.RMV;
this.val = val;
@@ -929,7 +935,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
/**
* @return Stored value.
*/
- private V value() {
+ private Entry<? extends K, ? extends V> entry() {
return val;
}
@@ -963,7 +969,9 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
* @param storeOperation Store operation.
* @param valStatus Value status.
*/
- private void update(@Nullable V val, StoreOperation storeOperation, ValueStatus valStatus) {
+ private void update(@Nullable Entry<? extends K, ? extends V> val,
+ StoreOperation storeOperation,
+ ValueStatus valStatus) {
this.val = val;
this.storeOperation = storeOperation;
this.valStatus = valStatus;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 0baf2b1..cd004e2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.managers.discovery.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -504,7 +504,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
return;
}
- GridCacheConfiguration ccfg = cctx.config();
+ CacheConfiguration ccfg = cctx.config();
// Assign version on near node in CLOCK ordering mode even if fastMap is false.
GridCacheVersion updVer = ccfg.getAtomicWriteOrderMode() == CLOCK ? cctx.versions().next(topVer) : null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java
index ee7b848..f16c700 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java
@@ -18,7 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.jta;
import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.jetbrains.annotations.*;
@@ -32,7 +32,7 @@ public abstract class GridCacheJtaManagerAdapter<K, V> extends GridCacheManagerA
* @param ccfg Cache configuration.
* @throws IgniteCheckedException If failed.
*/
- public abstract void createTmLookup(GridCacheConfiguration ccfg) throws IgniteCheckedException;
+ public abstract void createTmLookup(CacheConfiguration ccfg) throws IgniteCheckedException;
/**
* Checks if cache is working in JTA transaction and enlist cache as XAResource if necessary.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java
index 709cc12..2ecddc7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java
@@ -18,7 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.jta;
import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.jetbrains.annotations.*;
/**
@@ -31,7 +31,7 @@ public class GridCacheNoopJtaManager<K, V> extends GridCacheJtaManagerAdapter<K,
}
/** {@inheritDoc} */
- @Override public void createTmLookup(GridCacheConfiguration ccfg) throws IgniteCheckedException {
+ @Override public void createTmLookup(CacheConfiguration ccfg) throws IgniteCheckedException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEx.java
index 88be2f3..581f01e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxEx.java
@@ -20,6 +20,7 @@ package org.gridgain.grid.kernal.processors.cache.transactions;
import org.apache.ignite.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*;
+import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.timeout.*;
@@ -31,7 +32,10 @@ import java.util.*;
/**
* Transaction managed by cache ({@code 'Ex'} stands for external).
*/
-public interface IgniteTxEx<K, V> extends IgniteTx, GridTimeoutObject {
+public interface IgniteTxEx<K, V> extends GridMetadataAware, IgniteTx, GridTimeoutObject {
+ /**
+ *
+ */
@SuppressWarnings("PublicInnerClass")
public enum FinalizationStatus {
/** Transaction was not finalized yet. */
@@ -124,6 +128,7 @@ public interface IgniteTxEx<K, V> extends IgniteTx, GridTimeoutObject {
public boolean markFinalizing(FinalizationStatus status);
/**
+ * @param cacheCtx Cache context.
* @param part Invalid partition.
*/
public void addInvalidPartition(GridCacheContext<K, V> cacheCtx, int part);
@@ -325,6 +330,7 @@ public interface IgniteTxEx<K, V> extends IgniteTx, GridTimeoutObject {
@Nullable public IgniteTxEntry<K, V> entry(IgniteTxKey<K> key);
/**
+ * @param ctx Cache context.
* @param failFast Fail-fast flag.
* @param key Key to look up.
* @param filter Filter to check.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxProxyImpl.java
index 0cb7f63..e2ad232 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxProxyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxProxyImpl.java
@@ -284,78 +284,6 @@ public class IgniteTxProxyImpl<K, V> implements IgniteTxProxy, Externalizable {
}
/** {@inheritDoc} */
- @Override public void copyMeta(GridMetadataAware from) {
- tx.copyMeta(from);
- }
-
- /** {@inheritDoc} */
- @Override public void copyMeta(Map<String, ?> data) {
- tx.copyMeta(data);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 addMeta(String name, V1 val) {
- return tx.addMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 putMetaIfAbsent(String name, V1 val) {
- return tx.putMetaIfAbsent(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 putMetaIfAbsent(String name, Callable<V1> c) {
- return tx.putMetaIfAbsent(name, c);
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public <V1> V1 addMetaIfAbsent(String name, V1 val) {
- return tx.addMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 addMetaIfAbsent(String name, @Nullable Callable<V1> c) {
- return tx.addMetaIfAbsent(name, c);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"RedundantTypeArguments"})
- @Override public <V1> V1 meta(String name) {
- return tx.<V1>meta(name);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"RedundantTypeArguments"})
- @Override public <V1> V1 removeMeta(String name) {
- return tx.<V1>removeMeta(name);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> boolean removeMeta(String name, V1 val) {
- return tx.removeMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> Map<String, V1> allMeta() {
- return tx.allMeta();
- }
-
- /** {@inheritDoc} */
- @Override public boolean hasMeta(String name) {
- return tx.hasMeta(name);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> boolean hasMeta(String name, V1 val) {
- return tx.hasMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> boolean replaceMeta(String name, V1 curVal, V1 newVal) {
- return tx.replaceMeta(name, curVal, newVal);
- }
-
- /** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(tx);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
index 03e1c80..24d8028 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.dataload;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.dataload.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.transactions.*;
@@ -235,7 +236,7 @@ public class GridDataLoadCacheUpdaters {
assert cache != null;
assert !F.isEmpty(entries);
- assert cache.getConfiguration(GridCacheConfiguration.class).getAtomicityMode() != ATOMIC;
+ assert cache.getConfiguration(CacheConfiguration.class).getAtomicityMode() != ATOMIC;
Map<Integer, Integer> partsCounts = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
index c2b8dac..e792e6d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
@@ -18,10 +18,9 @@
package org.gridgain.grid.kernal.processors.dr;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.dataload.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.dr.*;
@@ -39,7 +38,7 @@ public class GridDrDataLoadCacheUpdater<K, V> implements IgniteDataLoadCacheUpda
/** {@inheritDoc} */
@Override public void update(IgniteCache<K, V> cache0, Collection<Map.Entry<K, V>> col)
throws IgniteCheckedException {
- String cacheName = cache0.getConfiguration(GridCacheConfiguration.class).getName();
+ String cacheName = cache0.getConfiguration(CacheConfiguration.class).getName();
GridKernalContext ctx = ((GridKernal)cache0.ignite()).context();
IgniteLogger log = ctx.log(GridDrDataLoadCacheUpdater.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelper.java
index bb416f0..3c41ba2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelper.java
@@ -18,7 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
/**
* GGFS utility processor adapter.
@@ -29,7 +29,7 @@ public interface GridGgfsHelper {
*
* @param cfg Cache configuration.
*/
- public abstract void preProcessCacheConfiguration(GridCacheConfiguration cfg);
+ public abstract void preProcessCacheConfiguration(CacheConfiguration cfg);
/**
* Validate cache configuration for GGFS.
@@ -37,7 +37,7 @@ public interface GridGgfsHelper {
* @param cfg Cache configuration.
* @throws IgniteCheckedException If validation failed.
*/
- public abstract void validateCacheConfiguration(GridCacheConfiguration cfg) throws IgniteCheckedException;
+ public abstract void validateCacheConfiguration(CacheConfiguration cfg) throws IgniteCheckedException;
/**
* Check whether object is of type {@code GridGgfsBlockKey}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelperImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelperImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelperImpl.java
index f26159b..9478db5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelperImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsHelperImpl.java
@@ -18,7 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.eviction.*;
import org.gridgain.grid.cache.eviction.ggfs.*;
@@ -27,7 +27,7 @@ import org.gridgain.grid.cache.eviction.ggfs.*;
*/
public class GridGgfsHelperImpl implements GridGgfsHelper {
/** {@inheritDoc} */
- @Override public void preProcessCacheConfiguration(GridCacheConfiguration cfg) {
+ @Override public void preProcessCacheConfiguration(CacheConfiguration cfg) {
GridCacheEvictionPolicy evictPlc = cfg.getEvictionPolicy();
if (evictPlc instanceof GridCacheGgfsPerBlockLruEvictionPolicy && cfg.getEvictionFilter() == null)
@@ -35,7 +35,7 @@ public class GridGgfsHelperImpl implements GridGgfsHelper {
}
/** {@inheritDoc} */
- @Override public void validateCacheConfiguration(GridCacheConfiguration cfg) throws IgniteCheckedException {
+ @Override public void validateCacheConfiguration(CacheConfiguration cfg) throws IgniteCheckedException {
GridCacheEvictionPolicy evictPlc = cfg.getEvictionPolicy();
if (evictPlc != null && evictPlc instanceof GridCacheGgfsPerBlockLruEvictionPolicy) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
index 31a4ee0..563b76e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.events.*;
@@ -25,8 +26,6 @@ import org.apache.ignite.fs.*;
import org.apache.ignite.fs.mapreduce.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.*;
import org.gridgain.grid.cache.eviction.ggfs.*;
import org.gridgain.grid.kernal.*;
@@ -196,7 +195,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
// Check whether GGFS LRU eviction policy is set on data cache.
String dataCacheName = ggfsCtx.configuration().getDataCacheName();
- for (GridCacheConfiguration cacheCfg : ggfsCtx.kernalContext().config().getCacheConfiguration()) {
+ for (CacheConfiguration cacheCfg : ggfsCtx.kernalContext().config().getCacheConfiguration()) {
if (F.eq(dataCacheName, cacheCfg.getName())) {
GridCacheEvictionPolicy evictPlc = cacheCfg.getEvictionPolicy();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
index 9f38469..6205bde 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
@@ -18,13 +18,13 @@
package org.gridgain.grid.kernal.processors.ggfs;
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.fs.*;
import org.apache.ignite.fs.mapreduce.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.kernal.*;
@@ -250,10 +250,10 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter {
F.isEmpty(gridCfg.getCacheConfiguration()))
return;
- final Map<String, GridCacheConfiguration> cacheCfgs = new HashMap<>();
+ final Map<String, CacheConfiguration> cacheCfgs = new HashMap<>();
- F.forEach(gridCfg.getCacheConfiguration(), new CI1<GridCacheConfiguration>() {
- @Override public void apply(GridCacheConfiguration c) {
+ F.forEach(gridCfg.getCacheConfiguration(), new CI1<CacheConfiguration>() {
+ @Override public void apply(CacheConfiguration c) {
cacheCfgs.put(c.getName(), c);
}
});
@@ -263,7 +263,7 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter {
assert gridCfg.getGgfsConfiguration() != null;
for (IgniteFsConfiguration ggfsCfg : gridCfg.getGgfsConfiguration()) {
- GridCacheConfiguration cacheCfg = cacheCfgs.get(ggfsCfg.getDataCacheName());
+ CacheConfiguration cacheCfg = cacheCfgs.get(ggfsCfg.getDataCacheName());
if (cacheCfg == null)
continue; // No cache for the given GGFS configuration.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsHelper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsHelper.java
index b6de5f7..5d5e611 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsHelper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsHelper.java
@@ -18,7 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
/**
* No-op utils processor adapter.
@@ -26,12 +26,12 @@ import org.gridgain.grid.cache.*;
public class GridNoopGgfsHelper implements GridGgfsHelper {
/** {@inheritDoc} */
- @Override public void preProcessCacheConfiguration(GridCacheConfiguration cfg) {
+ @Override public void preProcessCacheConfiguration(CacheConfiguration cfg) {
// No-op.
}
/** {@inheritDoc} */
- @Override public void validateCacheConfiguration(GridCacheConfiguration cfg) throws IgniteCheckedException {
+ @Override public void validateCacheConfiguration(CacheConfiguration cfg) throws IgniteCheckedException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java
index 80fa7c8..29246d1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/query/GridQueryProcessor.java
@@ -18,11 +18,11 @@
package org.gridgain.grid.kernal.processors.query;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.portables.*;
import org.apache.ignite.spi.indexing.*;
import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.*;
@@ -101,7 +101,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
idx.start(ctx);
- for (GridCacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
+ for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
GridCacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
if (qryCfg != null) {
@@ -497,7 +497,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (portableIds == null) {
portableIds = new HashMap<>();
- for (GridCacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
+ for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
GridCacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
if (qryCfg != null) {
@@ -523,7 +523,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (declaredTypesById == null) {
declaredTypesById = new HashMap<>();
- for (GridCacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
+ for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){
GridCacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration();
if (qryCfg != null) {
[08/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
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);
[02/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
index 7e932ed..a93ca90 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
@@ -17,10 +17,10 @@
package org.gridgain.grid.kernal.processors.ggfs;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
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.*;
@@ -88,8 +88,8 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected GridCacheConfiguration cacheConfiguration(String cacheName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String cacheName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
index 3cebd3c..6decd26 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.gridgain.grid.cache.*;
@@ -114,7 +115,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
ggfsCfg.setPathModes(pathModes);
- GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -125,7 +126,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
dataCacheCfg.setQueryIndexEnabled(false);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -166,7 +167,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
ggfsCfg.setDefaultMode(PRIMARY);
ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap(SECONDARY_REST_CFG));
- GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -177,7 +178,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
dataCacheCfg.setQueryIndexEnabled(false);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
index 013771a..4880e78 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -100,7 +101,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
if (setSecondaryFs)
ggfsCfg.setSecondaryFileSystem(ggfsSecondary);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -111,7 +112,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -154,7 +155,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
ggfsCfg.setDefaultMode(PRIMARY);
ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:11500}"));
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -165,7 +166,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
index 0cae2a0..211d7b4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
@@ -19,10 +19,10 @@ package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.commons.io.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -123,8 +123,8 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected GridCacheConfiguration cacheConfiguration(String cacheName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String cacheName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
index 394d00b..ae4bfc8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
@@ -18,12 +18,12 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.typedef.*;
@@ -131,7 +131,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfNoDataCacheIsConfigured() throws Exception {
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setQueryIndexEnabled(false);
cc.setName("someName");
@@ -145,7 +145,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfNoMetadataCacheIsConfigured() throws Exception {
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setQueryIndexEnabled(false);
cc.setName(dataCache1Name);
@@ -159,9 +159,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfAffinityMapperIsWrongClass() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- for (GridCacheConfiguration cc : g1Cfg.getCacheConfiguration())
+ for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
cc.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
checkGridStartFails(g1Cfg, "Invalid GGFS data cache configuration (key affinity mapper class should be", true);
@@ -171,7 +171,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfGgfsConfigsHaveDifferentNames() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
String ggfsCfgName = "ggfs-cfg";
@@ -185,11 +185,11 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfQueryIndexingEnabledForDataCache() throws Exception {
- GridCacheConfiguration[] dataCaches = dataCaches(1024);
+ CacheConfiguration[] dataCaches = dataCaches(1024);
dataCaches[0].setQueryIndexEnabled(true);
- g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), CacheConfiguration.class));
checkGridStartFails(g1Cfg, "GGFS data cache cannot start with enabled query indexing", true);
}
@@ -198,11 +198,11 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfQueryIndexingEnabledForMetaCache() throws Exception {
- GridCacheConfiguration[] metaCaches = metaCaches();
+ CacheConfiguration[] metaCaches = metaCaches();
metaCaches[0].setQueryIndexEnabled(true);
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, CacheConfiguration.class));
checkGridStartFails(g1Cfg, "GGFS metadata cache cannot start with enabled query indexing", true);
}
@@ -212,7 +212,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
*/
@SuppressWarnings("NullableProblems")
public void testLocalNullGgfsNameIsSupported() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g1GgfsCfg1.setName(null);
@@ -223,7 +223,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfOffheapIsDisabledAndMaxSpaceSizeIsGreater() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g1GgfsCfg2.setMaxSpaceSize(999999999999999999L);
@@ -234,9 +234,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfOffheapIsEnabledAndMaxSpaceSizeIsGreater() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- for (GridCacheConfiguration cc : g1Cfg.getCacheConfiguration())
+ for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
cc.setOffHeapMaxMemory(1000000);
g1GgfsCfg2.setMaxSpaceSize(999999999999999999L);
@@ -249,9 +249,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfBackupsEnabled() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- for (GridCacheConfiguration cc : g1Cfg.getCacheConfiguration()) {
+ for (CacheConfiguration cc : g1Cfg.getCacheConfiguration()) {
cc.setCacheMode(PARTITIONED);
cc.setBackups(1);
}
@@ -263,7 +263,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testLocalIfNonPrimaryModeAndHadoopFileSystemUriIsNull() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g1GgfsCfg2.setDefaultMode(PROXY);
@@ -276,8 +276,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
public void testRemoteIfDataBlockSizeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+ g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
@@ -296,8 +296,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
public void testRemoteIfAffinityMapperGroupSizeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(4021), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+ g2Cfg.setCacheConfiguration(concat(dataCaches(4021), metaCaches(), CacheConfiguration.class));
G.start(g1Cfg);
@@ -317,9 +317,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
g2GgfsCfg1.setMetaCacheName("g2MetaCache1");
g2GgfsCfg2.setMetaCacheName("g2MetaCache2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
- GridCacheConfiguration.class));
+ CacheConfiguration.class));
g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
@@ -343,9 +343,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
g2GgfsCfg1.setDataCacheName("g2DataCache1");
g2GgfsCfg2.setDataCacheName("g2DataCache2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
- GridCacheConfiguration.class));
+ CacheConfiguration.class));
g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
@@ -366,9 +366,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
g2GgfsCfg1.setDataCacheName("g2DataCache1");
g2GgfsCfg2.setDataCacheName("g2DataCache2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
- GridCacheConfiguration.class));
+ CacheConfiguration.class));
g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
@@ -392,9 +392,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
g2GgfsCfg1.setMetaCacheName("g2MetaCache1");
g2GgfsCfg2.setMetaCacheName("g2MetaCache2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
- GridCacheConfiguration.class));
+ CacheConfiguration.class));
g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
@@ -418,8 +418,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
g2GgfsCfg1.setDefaultMode(DUAL_SYNC);
g2GgfsCfg2.setDefaultMode(DUAL_SYNC);
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+ g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
@@ -440,8 +440,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
g2GgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
g2GgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+ g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+ g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
@@ -486,16 +486,16 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @param cacheNames 2 Optional caches names.
* @return 2 preconfigured data caches.
*/
- private GridCacheConfiguration[] dataCaches(int grpSize, String... cacheNames) {
+ private CacheConfiguration[] dataCaches(int grpSize, String... cacheNames) {
assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
if (F.isEmpty(cacheNames))
cacheNames = new String[] {dataCache1Name, dataCache2Name};
- GridCacheConfiguration[] res = new GridCacheConfiguration[cacheNames.length];
+ CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
for (int i = 0; i < cacheNames.length; i++) {
- GridCacheConfiguration dataCache = defaultCacheConfiguration();
+ CacheConfiguration dataCache = defaultCacheConfiguration();
dataCache.setName(cacheNames[i]);
dataCache.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(grpSize));
@@ -512,16 +512,16 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
* @param cacheNames 2 Optional caches names.
* @return 2 preconfigured meta caches.
*/
- private GridCacheConfiguration[] metaCaches(String... cacheNames) {
+ private CacheConfiguration[] metaCaches(String... cacheNames) {
assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
if (F.isEmpty(cacheNames))
cacheNames = new String[] {metaCache1Name, metaCache2Name};
- GridCacheConfiguration[] res = new GridCacheConfiguration[cacheNames.length];
+ CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
for (int i = 0; i < cacheNames.length; i++) {
- GridCacheConfiguration metaCache = defaultCacheConfiguration();
+ CacheConfiguration metaCache = defaultCacheConfiguration();
metaCache.setName(cacheNames[i]);
metaCache.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index b196f4e..10a716a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -127,7 +128,7 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe
cfg.setDiscoverySpi(discoSpi);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setName("partitioned");
cc.setCacheMode(GridCacheMode.PARTITIONED);
@@ -136,7 +137,7 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe
cc.setAtomicityMode(TRANSACTIONAL);
cc.setQueryIndexEnabled(false);
- GridCacheConfiguration metaCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCfg = defaultCacheConfiguration();
metaCfg.setName("replicated");
metaCfg.setCacheMode(GridCacheMode.REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
index 31210f6..0853660 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -122,7 +123,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
ggfsCfg.setTrashPurgeTimeout(trashPurgeTimeout);
ggfsCfg.setManagementPort(++mgmtPort);
- GridCacheConfiguration dataCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCfg = defaultCacheConfiguration();
dataCfg.setName(DATA_CACHE_NAME);
dataCfg.setCacheMode(cacheMode);
@@ -138,7 +139,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
dataCfg.setQueryIndexEnabled(false);
dataCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCfg = defaultCacheConfiguration();
metaCfg.setName(META_CACHE_NAME);
metaCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
index eb27894..3e5edeb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -125,8 +125,8 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected GridCacheConfiguration cacheConfiguration(String cacheName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String cacheName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
index 3f2121e..142baf0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.ggfs;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
@@ -25,7 +26,6 @@ import org.apache.ignite.fs.mapreduce.*;
import org.apache.ignite.fs.mapreduce.records.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -107,7 +107,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
ggfsCfg.setDefaultMode(PRIMARY);
ggfsCfg.setFragmentizerEnabled(false);
- GridCacheConfiguration dataCacheCfg = new GridCacheConfiguration();
+ CacheConfiguration dataCacheCfg = new CacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -118,7 +118,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
dataCacheCfg.setBackups(0);
dataCacheCfg.setQueryIndexEnabled(false);
- GridCacheConfiguration metaCacheCfg = new GridCacheConfiguration();
+ CacheConfiguration metaCacheCfg = new CacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
index ef2ffe5..eec1ed6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.ggfs.split;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.fs.mapreduce.*;
-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.*;
@@ -59,7 +59,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe
ggfsCfg.setBlockSize(512);
ggfsCfg.setDefaultMode(PRIMARY);
- GridCacheConfiguration dataCacheCfg = new GridCacheConfiguration();
+ CacheConfiguration dataCacheCfg = new CacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -70,7 +70,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe
dataCacheCfg.setBackups(0);
dataCacheCfg.setQueryIndexEnabled(false);
- GridCacheConfiguration metaCacheCfg = new GridCacheConfiguration();
+ CacheConfiguration metaCacheCfg = new CacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index 380c278..e134486 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.rest.handlers.cache;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -54,7 +55,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
disco.setIpFinder(new TcpDiscoveryVmIpFinder(true));
// Cache config.
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(GridCacheMode.LOCAL);
cacheCfg.setQueryIndexEnabled(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
index cd2259b..c08b0b3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
@@ -18,12 +18,12 @@
package org.gridgain.grid.kernal.processors.service;
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.managed.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.affinity.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -67,7 +67,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs
if (svcs != null)
c.setServiceConfiguration(svcs);
- GridCacheConfiguration cc = new GridCacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration();
cc.setName(CACHE_NAME);
cc.setCacheMode(GridCacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
index 5a9641d..f79d336 100644
--- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
@@ -19,11 +19,11 @@ package org.gridgain.grid.lang;
import junit.framework.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -2855,7 +2855,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration ccfg = defaultCacheConfiguration();
+ CacheConfiguration ccfg = defaultCacheConfiguration();
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
index 4ccce38..88c1221 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.marshaller;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -28,7 +29,6 @@ import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.product.*;
import org.apache.ignite.streamer.*;
import org.apache.ignite.streamer.window.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.datastructures.*;
@@ -104,7 +104,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration namedCache = new GridCacheConfiguration();
+ CacheConfiguration namedCache = new CacheConfiguration();
namedCache.setName(CACHE_NAME);
namedCache.setAtomicityMode(TRANSACTIONAL);
@@ -112,7 +112,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
cfg.setStreamerConfiguration(streamerConfiguration());
- cfg.setCacheConfiguration(new GridCacheConfiguration(), namedCache);
+ cfg.setCacheConfiguration(new CacheConfiguration(), namedCache);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
index 197f80b..2046fb3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
@@ -18,8 +18,8 @@
package org.gridgain.grid.p2p;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-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.*;
@@ -73,8 +73,8 @@ public class GridP2PContinuousDeploymentSelfTest 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.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
index d1dba3d..4f252c7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.session;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.checkpoint.cache.*;
import org.apache.ignite.spi.checkpoint.jdbc.*;
import org.apache.ignite.spi.checkpoint.sharedfs.*;
@@ -77,7 +77,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract
String cacheName = "test-checkpoints";
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
index 7a28ed6..fa265d6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
@@ -26,7 +26,7 @@ import org.gridgain.testframework.junits.common.*;
import java.util.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.cache.GridCacheConfiguration.*;
+import static org.apache.ignite.cache.CacheConfiguration.*;
/**
* Tests grid embedded future use cases.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
index ba0ea01..16177e9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.util.ipc.shmem;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
-import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.gridgain.grid.util.typedef.*;
@@ -64,7 +64,7 @@ public class GridIpcSharedMemoryNodeStartup {
cfg.setGgfsConfiguration(ggfsCfg);
- GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
index ee4e0b6..27134c2 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
@@ -18,8 +18,8 @@
package org.gridgain.loadtests;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.lru.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -58,7 +58,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(CACHE_NAME);
cacheCfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
index e3f4603..848a666 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
@@ -18,6 +18,7 @@
package org.gridgain.loadtests.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.*;
@@ -176,7 +177,7 @@ public class GridCacheAffinityTransactionsOffHeapTest {
cfg.setGridName(name);
- GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
index 41ed82a..a46e717 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
@@ -19,6 +19,7 @@ package org.gridgain.loadtests.cache;
import com.beust.jcommander.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.lru.*;
@@ -102,7 +103,7 @@ public class GridCachePutRemoveLoadTest {
cfg.setGridName("g" + i);
- GridCacheConfiguration cacheCfg = cfg.getCacheConfiguration()[0];
+ CacheConfiguration cacheCfg = cfg.getCacheConfiguration()[0];
GridCacheDistributionMode distro = i == 0 &&
args.distribution() == CLIENT_ONLY ? CLIENT_ONLY : PARTITIONED_ONLY;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
index b8731d4..d0ec833 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
@@ -17,6 +17,7 @@
package org.gridgain.loadtests.cache;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.thread.*;
import org.gridgain.grid.cache.*;
@@ -126,7 +127,7 @@ public class GridCacheSingleNodeLoadTest {
c.setSystemExecutorService(new IgniteThreadPoolExecutor(THREADS * 2, THREADS * 2, 0L,
new LinkedBlockingQueue<Runnable>()));
- GridCacheConfiguration cc = new GridCacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration();
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/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
index 6fb07ab..5ce5aa3 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
@@ -18,17 +18,17 @@
package org.gridgain.loadtests.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.lang.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -61,12 +61,12 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Object key, @Nullable Object val) {
+ @Override public void write(Cache.Entry e) {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(Object key) {
+ @Override public void delete(Object key) {
// No-op.
}
};
@@ -104,7 +104,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
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/loadtests/capacity/spring-capacity-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml
index 7ca639b..814842e 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml
+++ b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml
@@ -56,7 +56,7 @@
<!--
Partitioned cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="cacheMode" value="PARTITIONED"/>
<!-- Initial cache size. -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
index 2ad9704..3733874 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
@@ -25,6 +25,7 @@ import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.jdk8.backport.*;
+import javax.cache.*;
import javax.cache.integration.*;
import java.util.concurrent.*;
@@ -123,12 +124,12 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> {
}
/** {@inheritDoc} */
- @Override public void put(GridTestKey key, Long val) {
+ @Override public void write(Cache.Entry<? extends GridTestKey, ? extends Long> e) {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(GridTestKey key) {
+ @Override public void delete(Object key) {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
index 2e80553..29a8c48 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
@@ -112,7 +112,7 @@
<!--
Partitioned cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 3a64ce5..aaea04a 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -18,6 +18,7 @@
package org.gridgain.loadtests.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
@@ -56,7 +57,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
c.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC);
c.getTransactionsConfiguration().setDefaultTxIsolation(REPEATABLE_READ);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(GridCacheMode.PARTITIONED);
cc.setStartSize(200);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
index a06df0a..6cb9de6 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
@@ -18,10 +18,10 @@
package org.gridgain.loadtests.swap;
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.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.eviction.fifo.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -33,6 +33,7 @@ import org.gridgain.loadtests.util.*;
import org.gridgain.testframework.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -73,11 +74,11 @@ public class GridSwapEvictAllBenchmark {
c.apply((long)i, String.valueOf(i));
}
- @Override public void put(Long key, @Nullable String val) {
+ @Override public void write(Cache.Entry<? extends Long, ? extends String> e) {
assert false;
}
- @Override public void remove(Long key) {
+ @Override public void delete(Object key) {
assert false;
}
});
@@ -260,7 +261,7 @@ public class GridSwapEvictAllBenchmark {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setSwapEnabled(true);
ccfg.setEvictSynchronized(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
index 165605e..4ae3a9f 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
@@ -19,6 +19,7 @@ package org.gridgain.testframework.junits;
import junit.framework.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -27,8 +28,6 @@ import org.apache.ignite.marshaller.*;
import org.apache.ignite.marshaller.jdk.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.log4j.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.license.*;
import org.gridgain.grid.kernal.processors.resource.*;
@@ -1120,8 +1119,8 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @return New cache configuration with modified defaults.
*/
- public static GridCacheConfiguration defaultCacheConfiguration() {
- GridCacheConfiguration cfg = new GridCacheConfiguration();
+ public static CacheConfiguration defaultCacheConfiguration() {
+ CacheConfiguration cfg = new CacheConfiguration();
cfg.setStartSize(1024);
cfg.setQueryIndexEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
index 657dfae..261f202 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
@@ -22,12 +22,14 @@ import org.apache.ignite.cache.store.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.transactions.*;
+import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -64,8 +66,8 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
ses.newSession(tx);
- store.put("k1", "v1");
- store.put("k2", "v2");
+ store.write(new CacheEntryImpl<>("k1", "v1"));
+ store.write(new CacheEntryImpl<>("k2", "v2"));
store.txEnd(true);
@@ -77,7 +79,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
ses.newSession(tx);
- store.remove("k1");
+ store.delete("k1");
store.txEnd(true);
@@ -97,7 +99,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
ses.newSession(tx);
// Put.
- store.put("k1", "v1");
+ store.write(new CacheEntryImpl<>("k1", "v1"));
store.txEnd(false); // Rollback.
@@ -110,7 +112,11 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
// Put all.
assertNull(store.load("k2"));
- store.putAll(Collections.singletonMap("k2", "v2"));
+ Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
+
+ col.add(new CacheEntryImpl<>("k2", "v2"));
+
+ store.writeAll(col);
store.txEnd(false); // Rollback.
@@ -120,7 +126,11 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
assertNull(store.load("k2"));
- store.putAll(Collections.singletonMap("k3", "v3"));
+ col = new ArrayList<>();
+
+ col.add(new CacheEntryImpl<>("k3", "v3"));
+
+ store.writeAll(col);
store.txEnd(true); // Commit.
@@ -130,7 +140,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
assertEquals("v3", store.load("k3"));
- store.put("k4", "v4");
+ store.write(new CacheEntryImpl<>("k4", "v4"));
store.txEnd(false); // Rollback.
@@ -143,7 +153,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
assertEquals("v3", store.load("k3"));
// Remove.
- store.remove("k3");
+ store.delete("k3");
store.txEnd(false); // Rollback.
@@ -154,7 +164,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
assertEquals("v3", store.load("k3"));
// Remove all.
- store.removeAll(Arrays.asList("k3"));
+ store.deleteAll(Arrays.asList("k3"));
store.txEnd(false); // Rollback.
@@ -195,7 +205,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
try {
ses.newSession(tx);
- store.put("key1", "val1");
+ store.write(new CacheEntryImpl<>("key1", "val1"));
if (tx != null && commit) {
store.txEnd(true);
@@ -208,12 +218,12 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
if (tx == null || commit)
assertEquals("val1", store.load("key1"));
- Map<String, String> m = new HashMap<>();
+ Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
- m.put("key2", "val2");
- m.put("key3", "val3");
+ col.add(new CacheEntryImpl<>("key2", "val2"));
+ col.add(new CacheEntryImpl<>("key3", "val3"));
- store.putAll(m);
+ store.writeAll(col);
if (tx != null && commit) {
store.txEnd(true);
@@ -221,31 +231,30 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
tx = new DummyTx();
}
- final AtomicInteger cntr = new AtomicInteger();
-
if (tx == null || commit) {
- store.loadAll(Arrays.asList("key1", "key2", "key3", "no_such_key"), new CI2<Object, Object>() {
- @Override public void apply(Object o, Object o1) {
- if ("key1".equals(o))
- assertEquals("val1", o1);
+ Map<Object, Object> loaded = store.loadAll(Arrays.asList("key1", "key2", "key3", "no_such_key"));
- if ("key2".equals(o))
- assertEquals("val2", o1);
+ for (Map.Entry<Object, Object> e : loaded.entrySet()) {
+ Object key = e.getKey();
+ Object val = e.getValue();
- if ("key3".equals(o))
- assertEquals("val3", o1);
+ if ("key1".equals(key))
+ assertEquals("val1", val);
- if ("no_such_key".equals(o))
- fail();
+ if ("key2".equals(key))
+ assertEquals("val2", val);
- cntr.incrementAndGet();
- }
- });
+ if ("key3".equals(key))
+ assertEquals("val3", val);
+
+ if ("no_such_key".equals(key))
+ fail();
+ }
- assertEquals(3, cntr.get());
+ assertEquals(3, loaded.size());
}
- store.removeAll(Arrays.asList("key2", "key3"));
+ store.deleteAll(Arrays.asList("key2", "key3"));
if (tx != null && commit) {
store.txEnd(true);
@@ -261,7 +270,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
assertEquals("val1", store.load("key1"));
}
- store.remove("key1");
+ store.delete("key1");
if (tx != null && commit) {
store.txEnd(true);
@@ -311,25 +320,17 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
if (rnd.nextBoolean())
assertNotNull(store.load(key));
else {
- final AtomicInteger cntr = new AtomicInteger();
-
- store.loadAll(Collections.singleton(key), new CI2<Object, Object>() {
- @Override public void apply(Object o, Object o1) {
- cntr.incrementAndGet();
+ Map<Object, Object> loaded = store.loadAll(Collections.singleton(key));
- assertNotNull(o);
- assertNotNull(o1);
+ assertEquals(1, loaded.size());
- UUID key = (UUID) o;
- UUID val = (UUID) o1;
+ Map.Entry<Object, Object> e = loaded.entrySet().iterator().next();
- assertTrue(key.equals(val) ||
- (key.getMostSignificantBits() == val.getLeastSignificantBits() &&
- key.getLeastSignificantBits() == val.getMostSignificantBits()));
- }
- });
+ UUID k = (UUID)e.getKey();
+ UUID v = (UUID)e.getValue();
- assertEquals(1, cntr.get());
+ assertTrue(k.equals(v) || (k.getMostSignificantBits() == v.getLeastSignificantBits()
+ && k.getLeastSignificantBits() == v.getMostSignificantBits()));
}
if (tx != null)
@@ -345,9 +346,9 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
queueEmpty = true;
else {
if (rnd.nextBoolean())
- store.remove(key);
+ store.delete(key);
else
- store.removeAll(Collections.singleton(key));
+ store.deleteAll(Collections.singleton(key));
if (tx != null)
store.txEnd(true);
@@ -362,9 +363,14 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
UUID val = new UUID(key.getLeastSignificantBits(), key.getMostSignificantBits());
if (rnd.nextBoolean())
- store.put(key, val);
- else
- store.putAll(Collections.singletonMap(key, val));
+ store.write(new CacheEntryImpl<>(key, val));
+ else {
+ Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
+
+ col.add(new CacheEntryImpl<>(key, val));
+
+ store.writeAll(col);
+ }
if (tx != null)
store.txEnd(true);
@@ -377,9 +383,14 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
UUID key = UUID.randomUUID();
if (rnd.nextBoolean())
- store.put(key, key);
- else
- store.putAll(Collections.singletonMap(key, key));
+ store.write(new CacheEntryImpl<>(key, key));
+ else {
+ Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
+
+ col.add(new CacheEntryImpl<>(key, key));
+
+ store.writeAll(col);
+ }
if (tx != null)
store.txEnd(true);
@@ -425,7 +436,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
ses.newSession(null);
- store.removeAll(keys);
+ store.deleteAll(keys);
keys.clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
index 9093ddb..549ce35 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
@@ -50,10 +50,11 @@ public class TestCacheSession implements CacheStoreSession {
}
/** {@inheritDoc} */
- @Override public Map<Object, Object> properties() {
+ @SuppressWarnings("unchecked")
+ @Override public <K, V> Map<K, V> properties() {
if (props == null)
props = U.newHashMap(1);
- return props;
+ return (Map<K, V>)props;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
index efe0b24..34a3b20 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
@@ -49,9 +49,10 @@ public class TestThreadLocalCacheSession implements CacheStoreSession {
}
/** {@inheritDoc} */
- @Override public Map<Object, Object> properties() {
+ @SuppressWarnings("unchecked")
+ @Override public <K, V> Map<K, V> properties() {
TestCacheSession ses = sesHolder.get();
- return ses != null ? ses.properties() : null;
+ return ses != null ? (Map<K, V>)ses.properties() : null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
index 0950e25..ba834b8 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
@@ -18,6 +18,7 @@
package org.gridgain.testframework.junits.common;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -152,7 +153,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
* @return {@code True} if near cache is enabled.
*/
protected static <K, V> boolean nearEnabled(GridCacheProjection<K,V> cache) {
- GridCacheConfiguration cfg = ((GridKernal)cache.gridProjection().ignite()).
+ CacheConfiguration cfg = ((GridKernal)cache.gridProjection().ignite()).
<K, V>internalCache(cache.name()).context().config();
return isNearEnabled(cfg);
@@ -248,7 +249,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
protected void awaitPartitionMapExchange() throws InterruptedException {
for (Ignite g : G.allGrids()) {
for (GridCache<?, ?> c : ((GridEx)g).cachesx()) {
- GridCacheConfiguration cfg = c.configuration();
+ CacheConfiguration cfg = c.configuration();
if (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadMode() != NONE && g.cluster().nodes().size() > 1) {
GridCacheAffinityFunction aff = cfg.getAffinity();
@@ -650,8 +651,8 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
* @param cacheName Cache name.
* @return Cache configuration.
*/
- protected GridCacheConfiguration cacheConfiguration(IgniteConfiguration cfg, String cacheName) {
- for (GridCacheConfiguration ccfg : cfg.getCacheConfiguration()) {
+ protected CacheConfiguration cacheConfiguration(IgniteConfiguration cfg, String cacheName) {
+ for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) {
if (F.eq(cacheName, ccfg.getName()))
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/webapp/META-INF/gg-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml
index b4e8651..e29ab79 100644
--- a/modules/core/src/test/webapp/META-INF/gg-config.xml
+++ b/modules/core/src/test/webapp/META-INF/gg-config.xml
@@ -88,7 +88,7 @@
<!--
Partitioned cache example configuration (Atomic mode).
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -133,7 +133,7 @@
<!--
Partitioned cache example configuration (Transactional mode).
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="partitioned_tx"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -182,7 +182,7 @@
<!--
Replicated cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<property name="name" value="replicated"/>
<!--
@@ -220,7 +220,7 @@
<!--
Local cache example configuration.
-->
- <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
<!-- Cache name is 'local'. -->
<property name="name" value="local"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
index 7ee8605..ce009f3 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
@@ -22,10 +22,10 @@ import org.apache.hadoop.fs.*;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.permission.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.ggfs.hadoop.*;
import org.gridgain.grid.kernal.processors.ggfs.*;
@@ -155,7 +155,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
ggfsCfg.setBlockSize(512 * 1024);
ggfsCfg.setPrefetchBlocks(1);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -166,7 +166,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -224,8 +224,8 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
* @param gridName Grid name.
* @return Cache configuration.
*/
- protected GridCacheConfiguration[] cacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration[] cacheConfiguration(String gridName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -236,7 +236,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -244,7 +244,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
- return new GridCacheConfiguration[] {metaCacheCfg, cacheCfg};
+ return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
index c790c71..9852b2e 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
@@ -20,6 +20,7 @@ package org.gridgain.grid.ggfs;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.fs.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.gridgain.grid.cache.*;
@@ -129,7 +130,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
ggfsCfg.setPrefetchBlocks(PREFETCH_BLOCKS);
ggfsCfg.setSequentialReadsBeforePrefetch(SEQ_READS_BEFORE_PREFETCH);
- GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
@@ -141,7 +142,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setOffHeapMaxMemory(0);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
index 2c2ca51..e84de52 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.fs.*;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.permission.*;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -180,7 +181,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
ggfsCfg.setBlockSize(512 * 1024);
ggfsCfg.setPrefetchBlocks(1);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -191,7 +192,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -288,8 +289,8 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
* @param gridName Grid name.
* @return Cache configuration.
*/
- protected GridCacheConfiguration[] cacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration[] cacheConfiguration(String gridName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
@@ -300,7 +301,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
cacheCfg.setQueryIndexEnabled(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
@@ -308,7 +309,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
metaCacheCfg.setQueryIndexEnabled(false);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
- return new GridCacheConfiguration[] {metaCacheCfg, cacheCfg};
+ return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
}
/**
[05/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
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/GridCacheAbstractTransformWriteThroughSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
index a06f7f6..1552636 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -111,7 +111,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
stores.add(store);
- 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/distributed/dht/GridCacheAtomicFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
index 336d781..48dc7f6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
import org.gridgain.grid.util.typedef.*;
@@ -59,8 +60,8 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
}
/** {@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(atomicWriteOrderMode());
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/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index 1ee86af..af4cc1b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
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.*;
@@ -70,7 +71,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
@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(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/dht/GridCacheColocatedDebugTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
index 7ce762c..31ddb43 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
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.*;
@@ -66,7 +67,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.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/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
index 86bc4f3..15d4888 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
@@ -70,7 +71,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA
disco.setIpFinder(IP_FINDER);
- GridCacheConfiguration cc = new GridCacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration();
cc.setName(CACHE);
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/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
index 0b97c2c..3158000 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.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.apache.log4j.*;
import org.gridgain.grid.cache.*;
@@ -46,7 +47,7 @@ public class GridCacheColocatedTxSingleThreadedSelfTest extends IgniteTxSingleTh
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- 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/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
index cc6c8b8..1eea184 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -40,8 +40,8 @@ public class GridCacheDhtAtomicRemoveFailureTest extends GridCacheAbstractRemove
}
/** {@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.setDistributionMode(PARTITIONED_ONLY);
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/distributed/dht/GridCacheDhtEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
index 19c643a..9f3d387 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -59,7 +60,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10));
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/GridCacheDhtEntrySetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java
index a59f499..eacdce8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java
@@ -17,8 +17,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -34,8 +34,8 @@ public class GridCacheDhtEntrySetSelfTest extends GridCacheEntrySetAbstractSelfT
}
/** {@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.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/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 86f99da..abc3a1d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -18,11 +18,11 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.cache.eviction.fifo.*;
@@ -67,7 +67,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index 25e289c..b27ae8c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -18,11 +18,11 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.cache.eviction.fifo.*;
@@ -68,7 +68,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setPreloadMode(NONE);
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/GridCacheDhtEvictionsDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
index 4e73318..b0967a4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -52,7 +53,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes
c.setDiscoverySpi(spi);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setName("test");
cc.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/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index 47ecfa3..c4bbba6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
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.affinity.consistenthash.*;
@@ -64,7 +64,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
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/dht/GridCacheDhtMappingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
index 238ecd9..9bde654 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -46,7 +47,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/dht/GridCacheDhtPreloadBigDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
index cd6b5d4..cafa6d1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -30,7 +30,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.gridgain.testframework.junits.common.*;
import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
-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.GridCachePreloadMode.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
@@ -80,7 +80,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setPreloadBatchSize(preloadBatchSize);
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/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index 53ca0b7..8e4d363 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -73,7 +74,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
assert preloadMode != null;
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
index 921bbf1..0b13857 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@ -18,11 +18,11 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
@@ -78,7 +78,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index a174271..d544891 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.*;
@@ -62,7 +63,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
assert preloadMode != null;
- 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/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
index db07bab..182f823 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -161,7 +162,7 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract
cfg.setGridName(gridName);
- for (GridCacheConfiguration cCfg : cfg.getCacheConfiguration()) {
+ for (CacheConfiguration cCfg : cfg.getCacheConfiguration()) {
if (cCfg.getCacheMode() == GridCacheMode.PARTITIONED) {
cCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(2048, null));
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/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
index 93770c6..2bbf5d5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
@@ -27,8 +27,8 @@ import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
*/
public class GridCacheDhtPreloadOffHeapSelfTest extends GridCacheDhtPreloadSelfTest {
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) {
+ CacheConfiguration cacheCfg = super.cacheConfiguration(gridName);
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/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
index b7ed233..8ee5afa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -68,7 +69,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
assert preloadMode != null;
- 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/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index 196e4b9..ebaefe0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -18,11 +18,11 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
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.affinity.consistenthash.*;
@@ -38,7 +38,7 @@ import java.util.*;
import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
import static org.apache.ignite.events.IgniteEventType.*;
-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.GridCachePreloadMode.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
@@ -106,8 +106,8 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
* @param gridName Grid name.
* @return Cache configuration.
*/
- protected GridCacheConfiguration cacheConfiguration(String gridName) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration(String gridName) {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setPreloadBatchSize(preloadBatchSize);
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/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index 9d21843..2c55cc3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -18,9 +18,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
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.affinity.consistenthash.*;
@@ -36,7 +36,7 @@ import java.util.*;
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.GridCachePreloadMode.*;
import static org.gridgain.grid.kernal.processors.cache.distributed.dht.GridDhtPartitionState.*;
@@ -89,10 +89,10 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration[] cacheCfgs = new GridCacheConfiguration[cacheCnt];
+ CacheConfiguration[] cacheCfgs = new CacheConfiguration[cacheCnt];
for (int i = 0; i < cacheCnt; i++) {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName("partitioned-" + i);
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/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index 8c617f6..b2148c7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -31,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.GridCachePreloadMode.*;
@@ -81,7 +81,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setPreloadBatchSize(preloadBatchSize);
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/GridCacheDhtRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java
index 4f32853..bbe08eb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -33,8 +34,8 @@ public class GridCacheDhtRemoveFailureTest extends GridCacheAbstractRemoveFailur
}
/** {@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.setDistributionMode(PARTITIONED_ONLY);
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/distributed/dht/GridCacheDhtTxPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java
index a3274e8..bfe729e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTxPreloadSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -33,8 +34,8 @@ public class GridCacheDhtTxPreloadSelfTest extends IgniteTxPreloadAbstractTest {
}
/** {@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.setDistributionMode(PARTITIONED_ONLY);
cfg.setBackups(4);
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/GridCacheGlobalLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
index 6a781cf..5c70a7f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
@@ -19,6 +19,7 @@ import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
import org.junit.*;
+import javax.cache.*;
import java.util.concurrent.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -150,12 +151,12 @@ public class GridCacheGlobalLoadTest extends IgniteCacheAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Integer key, Integer val) {
+ @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) {
fail();
}
/** {@inheritDoc} */
- @Override public void remove(Integer key) {
+ @Override public void delete(Object key) {
fail();
}
}
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/GridCachePartitionedNearDisabledMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
index b699ce6..f74b6f7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -43,8 +44,8 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb
}
/** {@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(gridCount() - 1);
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/GridCachePartitionedPreloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
index fcf0b66..5de4d96 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.gridgain.grid.cache.*;
@@ -43,8 +44,8 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
private GridCachePreloadMode preloadMode = SYNC;
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cacheCfg = super.cacheConfiguration();
+ @Override protected CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cacheCfg = super.cacheConfiguration();
if (replicatedAffinity)
// replicate entries to all nodes
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/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index 92acdd8..f65531d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -71,7 +72,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 18));
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/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
index 4950b1f..e5e8dbe 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
@@ -45,8 +46,8 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends
}
/** {@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.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/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
index 34139d1..0b5d1b4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -58,8 +59,8 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
/**
* @return Cache configuration.
*/
- protected GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration() {
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setPreloadMode(SYNC);
cacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10));
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/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 5cb1c69..5cb7d08 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -79,8 +80,8 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
}
/** {@inheritDoc} */
- protected GridCacheConfiguration cacheConfiguration() {
- GridCacheConfiguration ccfg = new GridCacheConfiguration();
+ protected CacheConfiguration cacheConfiguration() {
+ CacheConfiguration ccfg = new CacheConfiguration();
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/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
index 5e7c021..8d660eb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
@@ -45,7 +46,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setCacheMode(GridCacheMode.PARTITIONED);
cacheCfg.setAtomicityMode(GridCacheAtomicityMode.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/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index ed37e75..8b10bc2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -18,10 +18,10 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.product.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.kernal.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -71,7 +71,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
c.setDiscoverySpi(spi);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
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/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
index 8ea4dff..852edc5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
@@ -37,8 +38,8 @@ import static org.apache.ignite.events.IgniteEventType.*;
*/
public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCacheNearOnlyMultiNodeFullApiSelfTest {
/** {@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 (cfg.getDistributionMode() == NEAR_ONLY)
cfg.setDistributionMode(CLIENT_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/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
index 8f66099..f234661 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -46,8 +47,8 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cc = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cc = super.cacheConfiguration(gridName);
cc.setPreloadMode(SYNC);
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/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
index b7e17a6..da51f86 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -56,8 +57,8 @@ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest
}
/** {@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(atomicWriteOrderMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
index 6861837..d989991 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.util.typedef.*;
@@ -32,8 +33,8 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
*/
public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNearOnlyMultiNodeFullApiSelfTest {
/** {@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 (cfg.getDistributionMode() != NEAR_ONLY)
cfg.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/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
index a4fb8e8..92f9a6a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -39,8 +40,8 @@ public class GridCacheAtomicNearRemoveFailureTest extends GridCacheAbstractRemov
}
/** {@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.setDistributionMode(NEAR_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/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
index be23088..0f66b9a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -55,8 +56,8 @@ public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedO
}
/** {@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(atomicWriteOrderMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
index 07852a0..f429ce3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -56,8 +57,8 @@ public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends
}
/** {@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(atomicWriteOrderMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
index 3e45e53..70d80fb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
@@ -34,8 +34,8 @@ public class GridCacheAtomicPartitionedMetricsSelfTest extends GridCacheAbstract
private static final int GRID_CNT = 2;
/** {@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(gridCount() - 1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
index cdb2497..877ac1c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -39,8 +40,8 @@ public class GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest extends GridC
}
/** {@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.setDistributionMode(NEAR_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/distributed/near/GridCacheGetStoreErrorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
index 3865b44..bf9902e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -26,8 +27,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.gridgain.grid.cache.*;
import org.gridgain.testframework.*;
import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.concurrent.*;
import static org.apache.ignite.events.IgniteEventType.*;
@@ -58,7 +59,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest {
c.setDiscoverySpi(disco);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(cacheMode);
cc.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY);
@@ -69,11 +70,11 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest {
throw new IgniteException("Failed to get key from store: " + key);
}
- @Override public void put(Object key,@Nullable Object val) {
+ @Override public void write(Cache.Entry<?, ?> entry) {
// No-op.
}
- @Override public void remove(Object key) {
+ @Override public void delete(Object key) {
// No-op.
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 293542d..87166fd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.resources.*;
@@ -52,7 +53,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
cc.setDistributionMode(NEAR_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/near/GridCacheNearJobExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java
index f716f7b..651bac2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -34,7 +35,7 @@ public class GridCacheNearJobExecutionSelfTest extends GridCacheAbstractJobExecu
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- GridCacheConfiguration cc = defaultCacheConfiguration();
+ CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(GridCacheMode.PARTITIONED);
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.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/near/GridCacheNearMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
index 5fbcd9f..dda01a1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -74,8 +75,8 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception {
- GridCacheConfiguration cc = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ CacheConfiguration cc = super.cacheConfiguration(gridName);
cc.setCacheMode(GridCacheMode.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/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index 7025a7b..331f670 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.transactions.*;
import org.apache.log4j.*;
@@ -60,7 +61,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
c.getTransactionsConfiguration().setTxSerializableEnabled(true);
- 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/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index 7d97169..8e0f001 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
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.*;
@@ -35,6 +36,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -89,7 +91,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setStore(store);
@@ -949,12 +951,12 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Integer key, @Nullable String val) {
- map.put(key, val);
+ @Override public void write(Cache.Entry<? extends Integer, ? extends String> e) {
+ map.put(e.getKey(), e.getValue());
}
/** {@inheritDoc} */
- @Override public void remove(Integer 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/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index c97ae6b..375f584 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@ -17,7 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
-import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -26,8 +26,8 @@ import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.concurrent.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
@@ -70,7 +70,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(disco);
- GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
@@ -369,12 +369,12 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(Integer key, @Nullable String val) {
- map.put(key, val);
+ @Override public void write(Cache.Entry<? extends Integer, ? extends String> e) {
+ map.put(e.getKey(), e.getValue());
}
/** {@inheritDoc} */
- @Override public void remove(Integer 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/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 61ba20e..b46eb33 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
@@ -55,8 +56,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
}
/** {@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 (cnt.getAndIncrement() == 0) {
info("Use grid '" + gridName + "' as near-only.");
[12/13] incubator-ignite git commit: ignite-42
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index 1d4fdb4..cc51e9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@ -17,15 +17,1705 @@
package org.apache.ignite.cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.store.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.portables.PortableObject;
+import org.apache.ignite.spi.indexing.*;
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.cache.affinity.*;
+import org.gridgain.grid.cache.affinity.consistenthash.*;
+import org.gridgain.grid.cache.cloner.*;
+import org.gridgain.grid.cache.datastructures.*;
+import org.gridgain.grid.cache.eviction.*;
+import org.gridgain.grid.cache.query.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
import javax.cache.configuration.*;
+import java.util.*;
/**
- * TODO: Add class description.
- *
- * @author @java.author
- * @version @java.version
+ * This class defines grid cache configuration. This configuration is passed to
+ * grid via {@link IgniteConfiguration#getCacheConfiguration()} method. It defines all configuration
+ * parameters required to start a cache within grid instance. You can have multiple caches
+ * configured with different names within one grid.
+ * <p>
+ * Cache configuration is set on {@link
+ * IgniteConfiguration#setCacheConfiguration(CacheConfiguration...)} method. This adapter is a simple bean and
+ * can be configured from Spring XML files (or other DI frameworks). <p> Note that absolutely all configuration
+ * properties are optional, so users should only change what they need.
*/
-// TODO: remove 'abstract'
-public abstract class CacheConfiguration<K, V> implements Configuration<K, V> {
+@SuppressWarnings("RedundantFieldInitialization")
+public class CacheConfiguration extends MutableConfiguration {
+ /** Default atomic sequence reservation size. */
+ public static final int DFLT_ATOMIC_SEQUENCE_RESERVE_SIZE = 1000;
+
+ /** Default size of preload thread pool. */
+ public static final int DFLT_PRELOAD_THREAD_POOL_SIZE = 2;
+
+ /** Default preload timeout (ms).*/
+ public static final long DFLT_PRELOAD_TIMEOUT = 10000;
+
+ /** Time in milliseconds to wait between preload messages to avoid overloading CPU. */
+ public static final long DFLT_PRELOAD_THROTTLE = 0;
+
+ /**
+ * Default time to live. The value is <tt>0</tt> which means that
+ * cached objects never expire based on time.
+ */
+ public static final long DFLT_TIME_TO_LIVE = 0;
+
+ /** Default number of backups. */
+ public static final int DFLT_BACKUPS = 0;
+
+ /** Default caching mode. */
+ public static final GridCacheMode DFLT_CACHE_MODE = GridCacheMode.REPLICATED;
+
+ /** Default atomicity mode. */
+ public static final GridCacheAtomicityMode DFLT_CACHE_ATOMICITY_MODE = GridCacheAtomicityMode.ATOMIC;
+
+ /** Default value for cache distribution mode. */
+ public static final GridCacheDistributionMode DFLT_DISTRIBUTION_MODE = GridCacheDistributionMode.PARTITIONED_ONLY;
+
+ /** Default query timeout. */
+ public static final long DFLT_QUERY_TIMEOUT = 0;
+
+ /** Default lock timeout. */
+ public static final long DFLT_LOCK_TIMEOUT = 0;
+
+ /** Initial default cache size. */
+ public static final int DFLT_START_SIZE = 1500000;
+
+ /** Default cache size to use with eviction policy. */
+ public static final int DFLT_CACHE_SIZE = 100000;
+
+ /** Initial default near cache size. */
+ public static final int DFLT_NEAR_START_SIZE = DFLT_START_SIZE / 4;
+
+ /** Default value for 'invalidate' flag that indicates if this is invalidation-based cache. */
+ public static final boolean DFLT_INVALIDATE = false;
+
+ /** Default value for 'storeValueBytes' flag indicating if value bytes should be stored. */
+ public static final boolean DFLT_STORE_VALUE_BYTES = true;
+
+ /** Default preload mode for distributed cache. */
+ public static final GridCachePreloadMode DFLT_PRELOAD_MODE = GridCachePreloadMode.ASYNC;
+
+ /** Default preload batch size in bytes. */
+ public static final int DFLT_PRELOAD_BATCH_SIZE = 512 * 1024; // 512K
+
+ /** Default maximum eviction queue ratio. */
+ public static final float DFLT_MAX_EVICTION_OVERFLOW_RATIO = 10;
+
+ /** Default eviction synchronized flag. */
+ public static final boolean DFLT_EVICT_SYNCHRONIZED = false;
+
+ /** Default near nodes eviction synchronized flag. */
+ public static final boolean DFLT_EVICT_NEAR_SYNCHRONIZED = true;
+
+ /** Default eviction key buffer size for batching synchronized evicts. */
+ public static final int DFLT_EVICT_KEY_BUFFER_SIZE = 1024;
+
+ /** Default synchronous eviction timeout in milliseconds. */
+ public static final long DFLT_EVICT_SYNCHRONIZED_TIMEOUT = 10000;
+
+ /** Default synchronous eviction concurrency level. */
+ public static final int DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL = 4;
+
+ /** Default value for eager ttl flag. */
+ public static final boolean DFLT_EAGER_TTL = true;
+
+ /** Default off-heap storage size is {@code -1} which means that off-heap storage is disabled. */
+ public static final long DFLT_OFFHEAP_MEMORY = -1;
+
+ /** Default value for 'swapEnabled' flag. */
+ public static final boolean DFLT_SWAP_ENABLED = false;
+
+ /** Default value for 'maxConcurrentAsyncOps'. */
+ public static final int DFLT_MAX_CONCURRENT_ASYNC_OPS = 500;
+
+ /** Default value for 'queryIndexEnabled' flag. */
+ public static final boolean DFLT_QUERY_INDEX_ENABLED = false;
+
+ /** Default value for 'writeBehindEnabled' flag. */
+ public static final boolean DFLT_WRITE_BEHIND_ENABLED = false;
+
+ /** Default flush size for write-behind cache store. */
+ public static final int DFLT_WRITE_BEHIND_FLUSH_SIZE = 10240; // 10K
+
+ /** Default critical size used when flush size is not specified. */
+ public static final int DFLT_WRITE_BEHIND_CRITICAL_SIZE = 16384; // 16K
+
+ /** Default flush frequency for write-behind cache store in milliseconds. */
+ public static final long DFLT_WRITE_BEHIND_FLUSH_FREQUENCY = 5000;
+
+ /** Default count of flush threads for write-behind cache store. */
+ public static final int DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT = 1;
+
+ /** Default batch size for write-behind cache store. */
+ public static final int DFLT_WRITE_BEHIND_BATCH_SIZE = 512;
+
+ /** Default maximum number of query iterators that can be stored. */
+ public static final int DFLT_MAX_QUERY_ITERATOR_CNT = 1024;
+
+ /** Default continuous query buffers queue size. */
+ @SuppressWarnings("UnusedDeclaration")
+ @Deprecated
+ public static final int DFLT_CONT_QUERY_QUEUE_SIZE = 1024 * 1024;
+
+ /** Default memory mode. */
+ public static final GridCacheMemoryMode DFLT_MEMORY_MODE = GridCacheMemoryMode.ONHEAP_TIERED;
+
+ /** Default continuous query max buffer size. */
+ @SuppressWarnings("UnusedDeclaration")
+ @Deprecated
+ public static final int DFLT_CONT_QUERY_MAX_BUF_SIZE = 1024;
+
+ /** Cache name. */
+ private String name;
+
+ /** Default batch size for all cache's sequences. */
+ private int seqReserveSize = DFLT_ATOMIC_SEQUENCE_RESERVE_SIZE;
+
+ /** Preload thread pool size. */
+ private int preloadPoolSize = DFLT_PRELOAD_THREAD_POOL_SIZE;
+
+ /** Preload timeout. */
+ private long preloadTimeout = DFLT_PRELOAD_TIMEOUT;
+
+ /** Default time to live for cache entries. */
+ private long ttl = DFLT_TIME_TO_LIVE;
+
+ /** Cache expiration policy. */
+ private GridCacheEvictionPolicy evictPlc;
+
+ /** Near cache eviction policy. */
+ private GridCacheEvictionPolicy nearEvictPlc;
+
+ /** Flag indicating whether eviction is synchronized. */
+ private boolean evictSync = DFLT_EVICT_SYNCHRONIZED;
+
+ /** Flag indicating whether eviction is synchronized with near nodes. */
+ private boolean evictNearSync = DFLT_EVICT_NEAR_SYNCHRONIZED;
+
+ /** Eviction key buffer size. */
+ private int evictKeyBufSize = DFLT_EVICT_KEY_BUFFER_SIZE;
+
+ /** Synchronous eviction timeout. */
+ private int evictSyncConcurrencyLvl = DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL;
+
+ /** Synchronous eviction timeout. */
+ private long evictSyncTimeout = DFLT_EVICT_SYNCHRONIZED_TIMEOUT;
+
+ /** Eviction filter. */
+ private GridCacheEvictionFilter<?, ?> evictFilter;
+
+ /** Maximum eviction overflow ratio. */
+ private float evictMaxOverflowRatio = DFLT_MAX_EVICTION_OVERFLOW_RATIO;
+
+ /** Eager ttl flag. */
+ private boolean eagerTtl = DFLT_EAGER_TTL;
+
+ /** Default lock timeout. */
+ private long dfltLockTimeout = DFLT_LOCK_TIMEOUT;
+
+ /** Default query timeout. */
+ private long dfltQryTimeout = DFLT_QUERY_TIMEOUT;
+
+ /** Default cache start size. */
+ private int startSize = DFLT_START_SIZE;
+
+ /** Default near cache start size. */
+ private int nearStartSize = DFLT_NEAR_START_SIZE;
+
+ /** Cache distribution mode. */
+ private GridCacheDistributionMode distro = DFLT_DISTRIBUTION_MODE;
+
+ /** Write synchronization mode. */
+ private GridCacheWriteSynchronizationMode writeSync;
+
+ /** */
+ private CacheStore<?, ?> store;
+
+ /** Node group resolver. */
+ private GridCacheAffinityFunction aff;
+
+ /** Cache mode. */
+ private GridCacheMode cacheMode = DFLT_CACHE_MODE;
+
+ /** Cache atomicity mode. */
+ private GridCacheAtomicityMode atomicityMode;
+
+ /** Write ordering mode. */
+ private GridCacheAtomicWriteOrderMode atomicWriteOrderMode;
+
+ /** Number of backups for cache. */
+ private int backups = DFLT_BACKUPS;
+
+ /** Flag indicating whether this is invalidation-based cache. */
+ private boolean invalidate = DFLT_INVALIDATE;
+
+ /** Flag indicating if cached values should be additionally stored in serialized form. */
+ private boolean storeValBytes = DFLT_STORE_VALUE_BYTES;
+
+ /** Name of class implementing GridCacheTmLookup. */
+ private String tmLookupClsName;
+
+ /** Distributed cache preload mode. */
+ private GridCachePreloadMode preloadMode = DFLT_PRELOAD_MODE;
+
+ /** Cache preload order. */
+ private int preloadOrder;
+
+ /** Preload batch size. */
+ private int preloadBatchSize = DFLT_PRELOAD_BATCH_SIZE;
+
+ /** Off-heap memory size. */
+ private long offHeapMaxMem = DFLT_OFFHEAP_MEMORY;
+
+ /** */
+ private boolean swapEnabled = DFLT_SWAP_ENABLED;
+
+ /** Maximum number of concurrent asynchronous operations. */
+ private int maxConcurrentAsyncOps = DFLT_MAX_CONCURRENT_ASYNC_OPS;
+
+ /** */
+ private boolean qryIdxEnabled = DFLT_QUERY_INDEX_ENABLED;
+
+ /** Write-behind feature. */
+ private boolean writeBehindEnabled = DFLT_WRITE_BEHIND_ENABLED;
+
+ /** Maximum size of write-behind cache. */
+ private int writeBehindFlushSize = DFLT_WRITE_BEHIND_FLUSH_SIZE;
+
+ /** Write-behind flush frequency in milliseconds. */
+ private long writeBehindFlushFreq = DFLT_WRITE_BEHIND_FLUSH_FREQUENCY;
+
+ /** Flush thread count for write-behind cache store. */
+ private int writeBehindFlushThreadCnt = DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT;
+
+ /** Maximum batch size for write-behind cache store. */
+ private int writeBehindBatchSize = DFLT_WRITE_BEHIND_BATCH_SIZE;
+
+ /** Maximum number of query iterators that can be stored. */
+ private int maxQryIterCnt = DFLT_MAX_QUERY_ITERATOR_CNT;
+
+ /** Memory mode. */
+ private GridCacheMemoryMode memMode = DFLT_MEMORY_MODE;
+
+ /** */
+ private GridCacheCloner cloner;
+
+ /** */
+ private GridCacheAffinityKeyMapper affMapper;
+
+ /** */
+ private String indexingSpiName;
+
+ /** */
+ private long preloadDelay;
+
+ /** */
+ private long preloadThrottle = DFLT_PRELOAD_THROTTLE;
+
+ /** */
+ private GridCacheInterceptor<?, ?> interceptor;
+
+ /** */
+ private boolean portableEnabled;
+
+ /** */
+ private boolean keepPortableInStore = true;
+
+ /** Query configuration. */
+ private GridCacheQueryConfiguration qryCfg;
+
+ /** Empty constructor (all values are initialized to their defaults). */
+ public CacheConfiguration() {
+ /* No-op. */
+ }
+
+ /**
+ * Copy constructor.
+ *
+ * @param cfg Configuration to copy.
+ */
+ public CacheConfiguration(CompleteConfiguration cfg) {
+ super(cfg);
+
+ if (!(cfg instanceof CacheConfiguration))
+ return;
+
+ CacheConfiguration cc = (CacheConfiguration)cfg;
+
+ /*
+ * NOTE: MAKE SURE TO PRESERVE ALPHABETIC ORDER!
+ * ==============================================
+ */
+ aff = cc.getAffinity();
+ affMapper = cc.getAffinityMapper();
+ atomicityMode = cc.getAtomicityMode();
+ atomicWriteOrderMode = cc.getAtomicWriteOrderMode();
+ backups = cc.getBackups();
+ cacheLoaderFactory = cc.getCacheLoaderFactory();
+ cacheMode = cc.getCacheMode();
+ cacheWriterFactory = cc.getCacheWriterFactory();
+ cloner = cc.getCloner();
+ dfltLockTimeout = cc.getDefaultLockTimeout();
+ dfltQryTimeout = cc.getDefaultQueryTimeout();
+ distro = cc.getDistributionMode();
+ eagerTtl = cc.isEagerTtl();
+ evictFilter = cc.getEvictionFilter();
+ evictKeyBufSize = cc.getEvictSynchronizedKeyBufferSize();
+ evictMaxOverflowRatio = cc.getEvictMaxOverflowRatio();
+ evictNearSync = cc.isEvictNearSynchronized();
+ evictPlc = cc.getEvictionPolicy();
+ evictSync = cc.isEvictSynchronized();
+ evictSyncConcurrencyLvl = cc.getEvictSynchronizedConcurrencyLevel();
+ evictSyncTimeout = cc.getEvictSynchronizedTimeout();
+ expiryPolicyFactory = cc.getExpiryPolicyFactory();
+ indexingSpiName = cc.getIndexingSpiName();
+ interceptor = cc.getInterceptor();
+ invalidate = cc.isInvalidate();
+ isReadThrough = cc.isReadThrough();
+ isWriteThrough = cc.isWriteThrough();
+ keepPortableInStore = cc.isKeepPortableInStore();
+ offHeapMaxMem = cc.getOffHeapMaxMemory();
+ maxConcurrentAsyncOps = cc.getMaxConcurrentAsyncOperations();
+ maxQryIterCnt = cc.getMaximumQueryIteratorCount();
+ memMode = cc.getMemoryMode();
+ name = cc.getName();
+ nearStartSize = cc.getNearStartSize();
+ nearEvictPlc = cc.getNearEvictionPolicy();
+ portableEnabled = cc.isPortableEnabled();
+ preloadMode = cc.getPreloadMode();
+ preloadBatchSize = cc.getPreloadBatchSize();
+ preloadDelay = cc.getPreloadPartitionedDelay();
+ preloadOrder = cc.getPreloadOrder();
+ preloadPoolSize = cc.getPreloadThreadPoolSize();
+ preloadTimeout = cc.getPreloadTimeout();
+ preloadThrottle = cc.getPreloadThrottle();
+ qryCfg = cc.getQueryConfiguration();
+ qryIdxEnabled = cc.isQueryIndexEnabled();
+ seqReserveSize = cc.getAtomicSequenceReserveSize();
+ startSize = cc.getStartSize();
+ store = cc.getStore();
+ storeValBytes = cc.isStoreValueBytes();
+ swapEnabled = cc.isSwapEnabled();
+ tmLookupClsName = cc.getTransactionManagerLookupClassName();
+ ttl = cc.getDefaultTimeToLive();
+ writeBehindBatchSize = cc.getWriteBehindBatchSize();
+ writeBehindEnabled = cc.isWriteBehindEnabled();
+ writeBehindFlushFreq = cc.getWriteBehindFlushFrequency();
+ writeBehindFlushSize = cc.getWriteBehindFlushSize();
+ writeBehindFlushThreadCnt = cc.getWriteBehindFlushThreadCount();
+ writeSync = cc.getWriteSynchronizationMode();
+ }
+
+ /**
+ * Cache name. If not provided or {@code null}, then this will be considered a default
+ * cache which can be accessed via {@link Ignite#cache(String) Grid.cache(null)} method. Otherwise, if name
+ * is provided, the cache will be accessed via {@link Ignite#cache(String)} method.
+ *
+ * @return Cache name.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets cache name.
+ *
+ * @param name Cache name. May be <tt>null</tt>, but may not be empty string.
+ */
+ public void setName(String name) {
+ A.ensure(name == null || !name.isEmpty(), "Name cannot be null or empty.");
+
+ this.name = name;
+ }
+
+ /**
+ * Gets time to live for all objects in cache. This value can be overridden for individual objects.
+ * If not set, then value is {@code 0} which means that objects never expire.
+ *
+ * @return Time to live for all objects in cache.
+ */
+ public long getDefaultTimeToLive() {
+ return ttl;
+ }
+
+ /**
+ * Sets time to live for all objects in cache. This value can be override for individual objects.
+ *
+ * @param ttl Time to live for all objects in cache.
+ */
+ public void setDefaultTimeToLive(long ttl) {
+ this.ttl = ttl;
+ }
+
+ /**
+ * Gets cache eviction policy. By default, returns {@code null}
+ * which means that evictions are disabled for cache.
+ *
+ * @return Cache eviction policy or {@code null} if evictions should be disabled.
+ */
+ @SuppressWarnings({"unchecked"})
+ @Nullable public <K, V> GridCacheEvictionPolicy<K, V> getEvictionPolicy() {
+ return evictPlc;
+ }
+
+ /**
+ * Sets cache eviction policy.
+ *
+ * @param evictPlc Cache expiration policy.
+ */
+ public void setEvictionPolicy(@Nullable GridCacheEvictionPolicy evictPlc) {
+ this.evictPlc = evictPlc;
+ }
+
+ /**
+ * Gets cache distribution mode. This parameter is taken into account only if
+ * {@link #getCacheMode()} is set to {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} mode.
+ * <p>
+ * If not set, default value is {@link #DFLT_DISTRIBUTION_MODE}.
+ *
+ * @return Cache distribution mode.
+ */
+ public GridCacheDistributionMode getDistributionMode() {
+ return distro;
+ }
+
+ /**
+ * Sets cache distribution mode.
+ *
+ * @param distro Distribution mode.
+ */
+ public void setDistributionMode(GridCacheDistributionMode distro) {
+ this.distro = distro;
+ }
+
+ /**
+ * Gets write synchronization mode. This mode controls whether the main
+ * caller should wait for update on other nodes to complete or not.
+ *
+ * @return Write synchronization mode.
+ */
+ public GridCacheWriteSynchronizationMode getWriteSynchronizationMode() {
+ return writeSync;
+ }
+
+ /**
+ * Sets write synchronization mode.
+ *
+ * @param writeSync Write synchronization mode.
+ */
+ public void setWriteSynchronizationMode(GridCacheWriteSynchronizationMode writeSync) {
+ this.writeSync = writeSync;
+ }
+
+ /**
+ * Gets eviction policy for {@code near} cache which is different from the one used for
+ * {@code partitioned} cache. By default, returns {@code null}
+ * which means that evictions are disabled for near cache.
+ *
+ * @return Cache eviction policy or {@code null} if evictions should be disabled.
+ */
+ @SuppressWarnings({"unchecked"})
+ @Nullable public <K, V> GridCacheEvictionPolicy<K, V> getNearEvictionPolicy() {
+ return nearEvictPlc;
+ }
+
+ /**
+ * Sets eviction policy for near cache. This property is only used for {@link GridCacheMode#PARTITIONED} caching
+ * mode.
+ *
+ * @param nearEvictPlc Eviction policy for near cache.
+ */
+ public void setNearEvictionPolicy(@Nullable GridCacheEvictionPolicy nearEvictPlc) {
+ this.nearEvictPlc = nearEvictPlc;
+ }
+
+ /**
+ * Gets flag indicating whether eviction is synchronized between primary and
+ * backup nodes on partitioned cache. If this parameter is {@code true} and
+ * swap is disabled then {@link GridCacheProjection#evict(Object)}
+ * and all its variations will involve all nodes where an entry is kept -
+ * this is a group of nodes responsible for partition to which
+ * corresponding key belongs. If this property is set to {@code false} then
+ * eviction is done independently on cache nodes.
+ * <p>
+ * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED}.
+ * <p>
+ * Note that it's not recommended to set this value to {@code true} if cache
+ * store is configured since it will allow to significantly improve cache
+ * performance.
+ *
+ * @return {@code true} If eviction is synchronized with backup nodes (or the
+ * rest of the nodes in case of replicated cache), {@code false} if not.
+ */
+ public boolean isEvictSynchronized() {
+ return evictSync;
+ }
+
+ /**
+ * Sets flag indicating whether eviction is synchronized with backup nodes (or the rest of the nodes for replicated
+ * cache).
+ *
+ * @param evictSync {@code true} if synchronized, {@code false} if not.
+ */
+ public void setEvictSynchronized(boolean evictSync) {
+ this.evictSync = evictSync;
+ }
+
+ /**
+ * Sets flag indicating whether eviction is synchronized with near nodes.
+ *
+ * @param evictNearSync {@code true} if synchronized, {@code false} if not.
+ */
+ public void setEvictNearSynchronized(boolean evictNearSync) {
+ this.evictNearSync = evictNearSync;
+ }
+
+ /**
+ * Gets flag indicating whether eviction on primary node is synchronized with
+ * near nodes where entry is kept. Default value is {@code true} and
+ * is defined by {@link #DFLT_EVICT_NEAR_SYNCHRONIZED}.
+ * <p>
+ * Note that in most cases this property should be set to {@code true} to keep
+ * cache consistency. But there may be the cases when user may use some
+ * special near eviction policy to have desired control over near cache
+ * entry set.
+ *
+ * @return {@code true} If eviction is synchronized with near nodes in
+ * partitioned cache, {@code false} if not.
+ */
+ public boolean isEvictNearSynchronized() {
+ return evictNearSync;
+ }
+
+ /**
+ * Gets size of the key buffer for synchronized evictions.
+ * <p>
+ * Default value is defined by {@link #DFLT_EVICT_KEY_BUFFER_SIZE}.
+ *
+ * @return Eviction key buffer size.
+ */
+ public int getEvictSynchronizedKeyBufferSize() {
+ return evictKeyBufSize;
+ }
+
+ /**
+ * Sets eviction key buffer size.
+ *
+ * @param evictKeyBufSize Eviction key buffer size.
+ */
+ public void setEvictSynchronizedKeyBufferSize(int evictKeyBufSize) {
+ this.evictKeyBufSize = evictKeyBufSize;
+ }
+
+ /**
+ * Gets concurrency level for synchronized evictions. This flag only makes sense
+ * with {@link #isEvictNearSynchronized()} or {@link #isEvictSynchronized()} set
+ * to {@code true}. When synchronized evictions are enabled, it is possible that
+ * local eviction policy will try to evict entries faster than evictions can be
+ * synchronized with backup or near nodes. This value specifies how many concurrent
+ * synchronous eviction sessions should be allowed before the system is forced to
+ * wait and let synchronous evictions catch up with the eviction policy.
+ * <p>
+ * Note that if synchronous evictions start lagging, it is possible that you have either
+ * too big or too small eviction key buffer size or small eviction timeout. In that case
+ * you will need to adjust {@link #getEvictSynchronizedKeyBufferSize} or
+ * {@link #getEvictSynchronizedTimeout()} values as well.
+ * <p>
+ * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL}.
+ *
+ * @return Synchronous eviction concurrency level.
+ */
+ public int getEvictSynchronizedConcurrencyLevel() {
+ return evictSyncConcurrencyLvl;
+ }
+
+ /**
+ * Sets concurrency level for synchronized evictions.
+ *
+ * @param evictSyncConcurrencyLvl Concurrency level for synchronized evictions.
+ */
+ public void setEvictSynchronizedConcurrencyLevel(int evictSyncConcurrencyLvl) {
+ this.evictSyncConcurrencyLvl = evictSyncConcurrencyLvl;
+ }
+
+ /**
+ * Gets timeout for synchronized evictions.
+ * <p>
+ * Node that initiates eviction waits for responses
+ * from remote nodes within this timeout.
+ * <p>
+ * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_TIMEOUT}.
+ *
+ * @return Synchronous eviction timeout.
+ */
+ public long getEvictSynchronizedTimeout() {
+ return evictSyncTimeout;
+ }
+
+ /**
+ * Sets timeout for synchronized evictions.
+ *
+ * @param evictSyncTimeout Timeout for synchronized evictions.
+ */
+ public void setEvictSynchronizedTimeout(long evictSyncTimeout) {
+ this.evictSyncTimeout = evictSyncTimeout;
+ }
+
+ /**
+ * This value denotes the maximum size of eviction queue in percents of cache
+ * size in case of distributed cache (replicated and partitioned) and using
+ * synchronized eviction (that is if {@link #isEvictSynchronized()} returns
+ * {@code true}).
+ * <p>
+ * That queue is used internally as a buffer to decrease network costs for
+ * synchronized eviction. Once queue size reaches specified value all required
+ * requests for all entries in the queue are sent to remote nodes and the queue
+ * is cleared.
+ * <p>
+ * Default value is defined by {@link #DFLT_MAX_EVICTION_OVERFLOW_RATIO} and
+ * equals to {@code 10%}.
+ *
+ * @return Maximum size of eviction queue in percents of cache size.
+ */
+ public float getEvictMaxOverflowRatio() {
+ return evictMaxOverflowRatio;
+ }
+
+ /**
+ * Sets maximum eviction overflow ratio.
+ *
+ * @param evictMaxOverflowRatio Maximum eviction overflow ratio.
+ */
+ public void setEvictMaxOverflowRatio(float evictMaxOverflowRatio) {
+ this.evictMaxOverflowRatio = evictMaxOverflowRatio;
+ }
+
+ /**
+ * Gets eviction filter to specify which entries should not be evicted
+ * (except explicit evict by calling {@link GridCacheEntry#evict()}).
+ * If {@link GridCacheEvictionFilter#evictAllowed(GridCacheEntry)} method returns
+ * {@code false} then eviction policy will not be notified and entry will
+ * never be evicted.
+ * <p>
+ * If not provided, any entry may be evicted depending on
+ * {@link #getEvictionPolicy() eviction policy} configuration.
+ *
+ * @return Eviction filter or {@code null}.
+ */
+ @SuppressWarnings("unchecked")
+ public <K, V> GridCacheEvictionFilter<K, V> getEvictionFilter() {
+ return (GridCacheEvictionFilter<K, V>)evictFilter;
+ }
+
+ /**
+ * Sets eviction filter.
+ *
+ * @param evictFilter Eviction filter.
+ */
+ public <K, V> void setEvictionFilter(GridCacheEvictionFilter<K, V> evictFilter) {
+ this.evictFilter = evictFilter;
+ }
+
+ /**
+ * Gets flag indicating whether expired cache entries will be eagerly removed from cache. When
+ * set to {@code false}, expired entries will be removed on next entry access.
+ * <p>
+ * When not set, default value is {@link #DFLT_EAGER_TTL}.
+ * <p>
+ * <b>Note</b> that this flag only matters for entries expiring based on
+ * {@link GridCacheEntry#timeToLive()} value and should not be confused with entry
+ * evictions based on configured {@link GridCacheEvictionPolicy}.
+ *
+ * @return Flag indicating whether GridGain will eagerly remove expired entries.
+ */
+ public boolean isEagerTtl() {
+ return eagerTtl;
+ }
+
+ /**
+ * Sets eager ttl flag.
+ *
+ * @param eagerTtl {@code True} if GridGain should eagerly remove expired cache entries.
+ * @see #isEagerTtl()
+ */
+ public void setEagerTtl(boolean eagerTtl) {
+ this.eagerTtl = eagerTtl;
+ }
+
+ /**
+ * Gets initial cache size which will be used to pre-create internal
+ * hash table after start. Default value is defined by {@link #DFLT_START_SIZE}.
+ *
+ * @return Initial cache size.
+ */
+ public int getStartSize() {
+ return startSize;
+ }
+
+ /**
+ * Initial size for internal hash map.
+ *
+ * @param startSize Cache start size.
+ */
+ public void setStartSize(int startSize) {
+ this.startSize = startSize;
+ }
+
+ /**
+ * Gets initial cache size for near cache which will be used to pre-create internal
+ * hash table after start. Default value is defined by {@link #DFLT_NEAR_START_SIZE}.
+ *
+ * @return Initial near cache size.
+ */
+ public int getNearStartSize() {
+ return nearStartSize;
+ }
+
+ /**
+ * Start size for near cache. This property is only used for {@link GridCacheMode#PARTITIONED} caching mode.
+ *
+ * @param nearStartSize Start size for near cache.
+ */
+ public void setNearStartSize(int nearStartSize) {
+ this.nearStartSize = nearStartSize;
+ }
+
+ /**
+ * Gets underlying persistent storage for read-through and write-through operations.
+ * If not provided, cache will not exhibit read-through or write-through behavior.
+ *
+ * @return Underlying persistent storage for read-through and write-through operations.
+ */
+ @SuppressWarnings({"unchecked"})
+ public <K, V> CacheStore<K, V> getStore() {
+ return (CacheStore<K, V>)store;
+ }
+
+ /**
+ * Sets persistent storage for cache data.
+ *
+ * @param store Persistent cache store.
+ */
+ public <K, V> void setStore(CacheStore<K, V> store) {
+ this.store = store;
+ }
+
+ /**
+ * Gets key topology resolver to provide mapping from keys to nodes.
+ *
+ * @return Key topology resolver to provide mapping from keys to nodes.
+ */
+ public GridCacheAffinityFunction getAffinity() {
+ return aff;
+ }
+
+ /**
+ * Sets affinity for cache keys.
+ *
+ * @param aff Cache key affinity.
+ */
+ public void setAffinity(GridCacheAffinityFunction aff) {
+ this.aff = aff;
+ }
+
+ /**
+ * Gets caching mode to use. You can configure cache either to be local-only,
+ * fully replicated, partitioned, or near. If not provided, {@link GridCacheMode#REPLICATED}
+ * mode will be used by default (defined by {@link #DFLT_CACHE_MODE} constant).
+ *
+ * @return {@code True} if cache is local.
+ */
+ public GridCacheMode getCacheMode() {
+ return cacheMode;
+ }
+
+ /**
+ * Sets caching mode.
+ *
+ * @param cacheMode Caching mode.
+ */
+ public void setCacheMode(GridCacheMode cacheMode) {
+ this.cacheMode = cacheMode;
+ }
+
+ /**
+ * Gets cache atomicity mode.
+ * <p>
+ * Default value is defined by {@link #DFLT_CACHE_ATOMICITY_MODE}.
+ *
+ * @return Cache atomicity mode.
+ */
+ public GridCacheAtomicityMode getAtomicityMode() {
+ return atomicityMode;
+ }
+
+ /**
+ * Sets cache atomicity mode.
+ *
+ * @param atomicityMode Cache atomicity mode.
+ */
+ public void setAtomicityMode(GridCacheAtomicityMode atomicityMode) {
+ this.atomicityMode = atomicityMode;
+ }
+
+ /**
+ * Gets cache write ordering mode. This property can be enabled only for {@link GridCacheAtomicityMode#ATOMIC}
+ * cache (for other atomicity modes it will be ignored).
+ *
+ * @return Cache write ordering mode.
+ */
+ public GridCacheAtomicWriteOrderMode getAtomicWriteOrderMode() {
+ return atomicWriteOrderMode;
+ }
+
+ /**
+ * Sets cache write ordering mode. This property can be enabled only for {@link GridCacheAtomicityMode#ATOMIC}
+ * cache (for other atomicity modes it will be ignored).
+ *
+ * @param atomicWriteOrderMode Cache write ordering mode.
+ */
+ public void setAtomicWriteOrderMode(GridCacheAtomicWriteOrderMode atomicWriteOrderMode) {
+ this.atomicWriteOrderMode = atomicWriteOrderMode;
+ }
+
+ /**
+ * Gets number of nodes used to back up single partition for {@link GridCacheMode#PARTITIONED} cache.
+ * <p>
+ * If not set, default value is {@link #DFLT_BACKUPS}.
+ *
+ * @return Number of backup nodes for one partition.
+ */
+ public int getBackups() {
+ return backups;
+ }
+
+ /**
+ * Sets number of nodes used to back up single partition for {@link GridCacheMode#PARTITIONED} cache.
+ * <p>
+ * If not set, default value is {@link #DFLT_BACKUPS}.
+ *
+ * @param backups Number of backup nodes for one partition.
+ */
+ public void setBackups(int backups) {
+ this.backups = backups;
+ }
+
+ /**
+ * Gets default lock acquisition timeout. Default value is defined by {@link #DFLT_LOCK_TIMEOUT}
+ * which is {@code 0} and means that lock acquisition will never timeout.
+ *
+ * @return Default lock timeout.
+ */
+ public long getDefaultLockTimeout() {
+ return dfltLockTimeout;
+ }
+
+ /**
+ * Sets default lock timeout in milliseconds. By default this value is defined by {@link #DFLT_LOCK_TIMEOUT}.
+ *
+ * @param dfltLockTimeout Default lock timeout.
+ */
+ public void setDefaultLockTimeout(long dfltLockTimeout) {
+ this.dfltLockTimeout = dfltLockTimeout;
+ }
+
+ /**
+ * Gets default query timeout. Default value is defined by {@link #DFLT_QUERY_TIMEOUT}. {@code 0} (zero)
+ * means that the query will never timeout and will wait for completion.
+ *
+ * @return Default query timeout, {@code 0} for never.
+ */
+ public long getDefaultQueryTimeout() {
+ return dfltQryTimeout;
+ }
+
+ /**
+ * Sets default query timeout, {@code 0} for never. For more information see {@link #getDefaultQueryTimeout()}.
+ *
+ * @param dfltQryTimeout Default query timeout.
+ */
+ public void setDefaultQueryTimeout(long dfltQryTimeout) {
+ this.dfltQryTimeout = dfltQryTimeout;
+ }
+
+ /**
+ * Invalidation flag. If {@code true}, values will be invalidated (nullified) upon commit in near cache.
+ *
+ * @return Invalidation flag.
+ */
+ public boolean isInvalidate() {
+ return invalidate;
+ }
+
+ /**
+ * Sets invalidation flag for near cache entries in this transaction. Default is {@code false}.
+ *
+ * @param invalidate Flag to set this cache into invalidation-based mode. Default value is {@code false}.
+ */
+ public void setInvalidate(boolean invalidate) {
+ this.invalidate = invalidate;
+ }
+
+ /**
+ * Flag indicating if cached values should be additionally stored in serialized form. It's set to true by default.
+ *
+ * @param storeValBytes {@code true} if cached values should be additionally stored in serialized form, {@code
+ * false} otherwise.
+ */
+ public void setStoreValueBytes(boolean storeValBytes) {
+ this.storeValBytes = storeValBytes;
+ }
+
+ /**
+ * Flag indicating if cached values should be additionally stored in serialized form.
+ * It's set to {@code true} by default.
+ *
+ * @return {@code true} if cached values should be additionally stored in
+ * serialized form, {@code false} otherwise.
+ */
+ public boolean isStoreValueBytes() {
+ return storeValBytes;
+ }
+
+ /**
+ * Gets class name of transaction manager finder for integration for JEE app servers.
+ *
+ * @return Transaction manager finder.
+ */
+ public String getTransactionManagerLookupClassName() {
+ return tmLookupClsName;
+ }
+
+ /**
+ * Sets look up mechanism for available {@code TransactionManager} implementation, if any.
+ *
+ * @param tmLookupClsName Name of class implementing GridCacheTmLookup interface that is used to
+ * receive JTA transaction manager.
+ */
+ public void setTransactionManagerLookupClassName(String tmLookupClsName) {
+ this.tmLookupClsName = tmLookupClsName;
+ }
+
+ /**
+ * Sets cache preload mode.
+ *
+ * @param preloadMode Preload mode.
+ */
+ public void setPreloadMode(GridCachePreloadMode preloadMode) {
+ this.preloadMode = preloadMode;
+ }
+
+ /**
+ * Gets preload mode for distributed cache.
+ * <p>
+ * Default is defined by {@link #DFLT_PRELOAD_MODE}.
+ *
+ * @return Preload mode.
+ */
+ public GridCachePreloadMode getPreloadMode() {
+ return preloadMode;
+ }
+
+ /**
+ * Gets cache preload order. Preload order can be set to non-zero value for caches with
+ * {@link GridCachePreloadMode#SYNC SYNC} or {@link GridCachePreloadMode#ASYNC ASYNC} preload modes only.
+ * <p/>
+ * If cache preload order is positive, preloading for this cache will be started only when preloading for
+ * all caches with smaller preload order (except caches with preload order {@code 0}) will be completed.
+ * <p/>
+ * Note that cache with order {@code 0} does not participate in ordering. This means that cache with
+ * preload order {@code 1} will never wait for any other caches. All caches with order {@code 0} will
+ * be preloaded right away concurrently with each other and ordered preload processes.
+ * <p/>
+ * If not set, cache order is 0, i.e. preloading is not ordered.
+ *
+ * @return Cache preload order.
+ */
+ public int getPreloadOrder() {
+ return preloadOrder;
+ }
+
+ /**
+ * Sets cache preload order.
+ *
+ * @param preloadOrder Cache preload order.
+ * @see #getPreloadOrder()
+ */
+ public void setPreloadOrder(int preloadOrder) {
+ this.preloadOrder = preloadOrder;
+ }
+
+ /**
+ * Gets size (in number bytes) to be loaded within a single preload message.
+ * Preloading algorithm will split total data set on every node into multiple
+ * batches prior to sending data. Default value is defined by
+ * {@link #DFLT_PRELOAD_BATCH_SIZE}.
+ *
+ * @return Size in bytes of a single preload message.
+ */
+ public int getPreloadBatchSize() {
+ return preloadBatchSize;
+ }
+
+ /**
+ * Sets preload batch size.
+ *
+ * @param preloadBatchSize Preload batch size.
+ */
+ public void setPreloadBatchSize(int preloadBatchSize) {
+ this.preloadBatchSize = preloadBatchSize;
+ }
+
+ /**
+ * Flag indicating whether GridGain should use swap storage by default. By default
+ * swap is disabled which is defined via {@link #DFLT_SWAP_ENABLED} constant.
+ * <p>
+ * Note that this flag may be overridden for cache projection created with flag
+ * {@link GridCacheFlag#SKIP_SWAP}.
+ *
+ * @return {@code True} if swap storage is enabled.
+ */
+ public boolean isSwapEnabled() {
+ return swapEnabled;
+ }
+
+ /**
+ * Flag indicating whether swap storage is enabled or not.
+ *
+ * @param swapEnabled {@code True} if swap storage is enabled.
+ */
+ public void setSwapEnabled(boolean swapEnabled) {
+ this.swapEnabled = swapEnabled;
+ }
+
+ /**
+ * Gets maximum number of allowed concurrent asynchronous operations. If 0 returned then number
+ * of concurrent asynchronous operations is unlimited.
+ * <p>
+ * If not set, default value is {@link #DFLT_MAX_CONCURRENT_ASYNC_OPS}.
+ * <p>
+ * If user threads do not wait for asynchronous operations to complete, it is possible to overload
+ * a system. This property enables back-pressure control by limiting number of scheduled asynchronous
+ * cache operations.
+ *
+ * @return Maximum number of concurrent asynchronous operations or {@code 0} if unlimited.
+ */
+ public int getMaxConcurrentAsyncOperations() {
+ return maxConcurrentAsyncOps;
+ }
+
+ /**
+ * Sets maximum number of concurrent asynchronous operations.
+ *
+ * @param maxConcurrentAsyncOps Maximum number of concurrent asynchronous operations.
+ * @see #getMaxConcurrentAsyncOperations()
+ */
+ public void setMaxConcurrentAsyncOperations(int maxConcurrentAsyncOps) {
+ this.maxConcurrentAsyncOps = maxConcurrentAsyncOps;
+ }
+
+ /**
+ * Flag indicating whether GridGain should attempt to index value and/or key instances
+ * stored in cache. If this property is {@code false}, then all indexing annotations
+ * inside of any class will be ignored. By default query indexing is disabled and
+ * defined via {@link #DFLT_QUERY_INDEX_ENABLED} constant.
+ *
+ * @return {@code True} if query indexing is enabled.
+ * @see #getMemoryMode()
+ */
+ public boolean isQueryIndexEnabled() {
+ return qryIdxEnabled;
+ }
+
+ /**
+ * Flag indicating whether query indexing is enabled or not.
+ *
+ * @param qryIdxEnabled {@code True} if query indexing is enabled.
+ */
+ public void setQueryIndexEnabled(boolean qryIdxEnabled) {
+ this.qryIdxEnabled = qryIdxEnabled;
+ }
+
+ /**
+ * Flag indicating whether GridGain should use write-behind behaviour for the cache store.
+ * By default write-behind is disabled which is defined via {@link #DFLT_WRITE_BEHIND_ENABLED}
+ * constant.
+ *
+ * @return {@code True} if write-behind is enabled.
+ */
+ public boolean isWriteBehindEnabled() {
+ return writeBehindEnabled;
+ }
+
+ /**
+ * Sets flag indicating whether write-behind is enabled.
+ *
+ * @param writeBehindEnabled {@code true} if write-behind is enabled.
+ */
+ public void setWriteBehindEnabled(boolean writeBehindEnabled) {
+ this.writeBehindEnabled = writeBehindEnabled;
+ }
+
+ /**
+ * Maximum size of the write-behind cache. If cache size exceeds this value,
+ * all cached items are flushed to the cache store and write cache is cleared.
+ * <p/>
+ * If not provided, default value is {@link #DFLT_WRITE_BEHIND_FLUSH_SIZE}.
+ * If this value is {@code 0}, then flush is performed according to the flush frequency interval.
+ * <p/>
+ * Note that you cannot set both, {@code flush} size and {@code flush frequency}, to {@code 0}.
+ *
+ * @return Maximum object count in write-behind cache.
+ */
+ public int getWriteBehindFlushSize() {
+ return writeBehindFlushSize;
+ }
+
+ /**
+ * Sets write-behind flush size.
+ *
+ * @param writeBehindFlushSize Write-behind cache flush size.
+ * @see #getWriteBehindFlushSize()
+ */
+ public void setWriteBehindFlushSize(int writeBehindFlushSize) {
+ this.writeBehindFlushSize = writeBehindFlushSize;
+ }
+
+ /**
+ * Frequency with which write-behind cache is flushed to the cache store in milliseconds.
+ * This value defines the maximum time interval between object insertion/deletion from the cache
+ * ant the moment when corresponding operation is applied to the cache store.
+ * <p>
+ * If not provided, default value is {@link #DFLT_WRITE_BEHIND_FLUSH_FREQUENCY}.
+ * If this value is {@code 0}, then flush is performed according to the flush size.
+ * <p>
+ * Note that you cannot set both, {@code flush} size and {@code flush frequency}, to {@code 0}.
+ *
+ * @return Write-behind flush frequency in milliseconds.
+ */
+ public long getWriteBehindFlushFrequency() {
+ return writeBehindFlushFreq;
+ }
+
+ /**
+ * Sets write-behind flush frequency.
+ *
+ * @param writeBehindFlushFreq Write-behind flush frequency in milliseconds.
+ * @see #getWriteBehindFlushFrequency()
+ */
+ public void setWriteBehindFlushFrequency(long writeBehindFlushFreq) {
+ this.writeBehindFlushFreq = writeBehindFlushFreq;
+ }
+
+ /**
+ * Number of threads that will perform cache flushing. Cache flushing is performed
+ * when cache size exceeds value defined by
+ * {@link #getWriteBehindFlushSize}, or flush interval defined by
+ * {@link #getWriteBehindFlushFrequency} is elapsed.
+ * <p/>
+ * If not provided, default value is {@link #DFLT_WRITE_FROM_BEHIND_FLUSH_THREAD_CNT}.
+ *
+ * @return Count of flush threads.
+ */
+ public int getWriteBehindFlushThreadCount() {
+ return writeBehindFlushThreadCnt;
+ }
+
+ /**
+ * Sets flush thread count for write-behind cache.
+ *
+ * @param writeBehindFlushThreadCnt Count of flush threads.
+ * @see #getWriteBehindFlushThreadCount()
+ */
+ public void setWriteBehindFlushThreadCount(int writeBehindFlushThreadCnt) {
+ this.writeBehindFlushThreadCnt = writeBehindFlushThreadCnt;
+ }
+
+ /**
+ * Maximum batch size for write-behind cache store operations. Store operations (get or remove)
+ * are combined in a batch of this size to be passed to
+ * {@link CacheStore#writeAll(Collection)} or
+ * {@link CacheStore#deleteAll(Collection)} methods.
+ * <p/>
+ * If not provided, default value is {@link #DFLT_WRITE_BEHIND_BATCH_SIZE}.
+ *
+ * @return Maximum batch size for store operations.
+ */
+ public int getWriteBehindBatchSize() {
+ return writeBehindBatchSize;
+ }
+
+ /**
+ * Sets maximum batch size for write-behind cache.
+ *
+ * @param writeBehindBatchSize Maximum batch size.
+ * @see #getWriteBehindBatchSize()
+ */
+ public void setWriteBehindBatchSize(int writeBehindBatchSize) {
+ this.writeBehindBatchSize = writeBehindBatchSize;
+ }
+
+ /**
+ * Cloner to be used for cloning values that are returned to user only if {@link GridCacheFlag#CLONE}
+ * is set on {@link GridCacheProjection}. Cloning values is useful when it is needed to get value from
+ * cache, change it and put it back (if the value was not cloned, then user would be updating the
+ * cached reference which would violate cache integrity).
+ * <p>
+ * <b>NOTE:</b> by default, cache uses {@link GridCacheBasicCloner} implementation which will clone only objects
+ * implementing {@link Cloneable} interface. You can also configure cache to use
+ * {@link GridCacheDeepCloner} which will perform deep-cloning of all objects returned from cache,
+ * regardless of the {@link Cloneable} interface. If none of the above cloners fit your
+ * logic, you can also provide your own implementation of {@link GridCacheCloner} interface.
+ *
+ * @return Cloner to be used if {@link GridCacheFlag#CLONE} flag is set on cache projection.
+ */
+ @SuppressWarnings({"unchecked"})
+ public GridCacheCloner getCloner() {
+ return cloner;
+ }
+
+ /**
+ * Sets cloner to be used if {@link GridCacheFlag#CLONE} flag is set on projection.
+ *
+ * @param cloner Cloner to use.
+ * @see #getCloner()
+ */
+ public void setCloner(GridCacheCloner cloner) {
+ this.cloner = cloner;
+ }
+
+ /**
+ * Gets default number of sequence values reserved for {@link GridCacheAtomicSequence} instances. After
+ * a certain number has been reserved, consequent increments of sequence will happen locally,
+ * without communication with other nodes, until the next reservation has to be made.
+ * <p>
+ * Default value is {@link #DFLT_ATOMIC_SEQUENCE_RESERVE_SIZE}.
+ *
+ * @return Atomic sequence reservation size.
+ */
+ public int getAtomicSequenceReserveSize() {
+ return seqReserveSize;
+ }
+
+ /**
+ * Sets default number of sequence values reserved for {@link GridCacheAtomicSequence} instances. After a certain
+ * number has been reserved, consequent increments of sequence will happen locally, without communication with other
+ * nodes, until the next reservation has to be made.
+ *
+ * @param seqReserveSize Atomic sequence reservation size.
+ * @see #getAtomicSequenceReserveSize()
+ */
+ public void setAtomicSequenceReserveSize(int seqReserveSize) {
+ this.seqReserveSize = seqReserveSize;
+ }
+
+ /**
+ * Gets size of preloading thread pool. Note that size serves as a hint and implementation
+ * may create more threads for preloading than specified here (but never less threads).
+ * <p>
+ * Default value is {@link #DFLT_PRELOAD_THREAD_POOL_SIZE}.
+ *
+ * @return Size of preloading thread pool.
+ */
+ public int getPreloadThreadPoolSize() {
+ return preloadPoolSize;
+ }
+
+ /**
+ * Sets size of preloading thread pool. Note that size serves as a hint and implementation may create more threads
+ * for preloading than specified here (but never less threads).
+ *
+ * @param preloadPoolSize Size of preloading thread pool.
+ */
+ public void setPreloadThreadPoolSize(int preloadPoolSize) {
+ this.preloadPoolSize = preloadPoolSize;
+ }
+
+ /**
+ * Gets preload timeout (ms).
+ * <p>
+ * Default value is {@link #DFLT_PRELOAD_TIMEOUT}.
+ *
+ * @return Preload timeout (ms).
+ */
+ public long getPreloadTimeout() {
+ return preloadTimeout;
+ }
+
+ /**
+ * Sets preload timeout (ms).
+ *
+ * @param preloadTimeout Preload timeout (ms).
+ */
+ public void setPreloadTimeout(long preloadTimeout) {
+ this.preloadTimeout = preloadTimeout;
+ }
+
+ /**
+ * Gets delay in milliseconds upon a node joining or leaving topology (or crash) after which preloading
+ * should be started automatically. Preloading should be delayed if you plan to restart nodes
+ * after they leave topology, or if you plan to start multiple nodes at once or one after another
+ * and don't want to repartition and preload until all nodes are started.
+ * <p>
+ * Delayed preloading is applied to {@link GridCacheMode#PARTITIONED} caches only.
+ * For better efficiency user should usually make sure that new nodes get placed on
+ * the same place of consistent hash ring as the left nodes, and that nodes are
+ * restarted before this delay expires. To place nodes on the same place in consistent hash ring,
+ * use {@link GridCacheConsistentHashAffinityFunction#setHashIdResolver(GridCacheAffinityNodeHashResolver)}
+ * to make sure that a node maps to the same hash ID event if restarted. As an example,
+ * node IP address and port combination may be used in this case.
+ * <p>
+ * Default value is {@code 0} which means that repartitioning and preloading will start
+ * immediately upon node leaving topology. If {@code -1} is returned, then preloading
+ * will only be started manually by calling {@link GridCache#forceRepartition()} method or
+ * from management console.
+ *
+ * @return Preloading delay, {@code 0} to start preloading immediately, {@code -1} to
+ * start preloading manually, or positive value to specify delay in milliseconds
+ * after which preloading should start automatically.
+ */
+ public long getPreloadPartitionedDelay() {
+ return preloadDelay;
+ }
+
+ /**
+ * Sets preload delay (see {@link #getPreloadPartitionedDelay()} for more information).
+ *
+ * @param preloadDelay Preload delay to set.
+ */
+ public void setPreloadPartitionedDelay(long preloadDelay) {
+ this.preloadDelay = preloadDelay;
+ }
+
+ /**
+ * Time in milliseconds to wait between preload messages to avoid overloading of CPU or network.
+ * When preloading large data sets, the CPU or network can get over-consumed with preloading messages,
+ * which consecutively may slow down the application performance. This parameter helps tune
+ * the amount of time to wait between preload messages to make sure that preloading process
+ * does not have any negative performance impact. Note that application will continue to work
+ * properly while preloading is still in progress.
+ * <p>
+ * Value of {@code 0} means that throttling is disabled. By default throttling is disabled -
+ * the default is defined by {@link #DFLT_PRELOAD_THROTTLE} constant.
+ *
+ * @return Time in milliseconds to wait between preload messages to avoid overloading of CPU,
+ * {@code 0} to disable throttling.
+ */
+ public long getPreloadThrottle() {
+ return preloadThrottle;
+ }
+
+ /**
+ * Time in milliseconds to wait between preload messages to avoid overloading of CPU or network. When preloading
+ * large data sets, the CPU or network can get over-consumed with preloading messages, which consecutively may slow
+ * down the application performance. This parameter helps tune the amount of time to wait between preload messages
+ * to make sure that preloading process does not have any negative performance impact. Note that application will
+ * continue to work properly while preloading is still in progress. <p> Value of {@code 0} means that throttling is
+ * disabled. By default throttling is disabled - the default is defined by {@link #DFLT_PRELOAD_THROTTLE} constant.
+ *
+ * @param preloadThrottle Time in milliseconds to wait between preload messages to avoid overloading of CPU, {@code
+ * 0} to disable throttling.
+ */
+ public void setPreloadThrottle(long preloadThrottle) {
+ this.preloadThrottle = preloadThrottle;
+ }
+
+ /**
+ * Affinity key mapper used to provide custom affinity key for any given key.
+ * Affinity mapper is particularly useful when several objects need to be collocated
+ * on the same node (they will also be backed up on the same nodes as well).
+ * <p>
+ * If not provided, then default implementation will be used. The default behavior
+ * is described in {@link GridCacheAffinityKeyMapper} documentation.
+ *
+ * @return Mapper to use for affinity key mapping.
+ */
+ public GridCacheAffinityKeyMapper getAffinityMapper() {
+ return affMapper;
+ }
+
+ /**
+ * Sets custom affinity mapper. If not provided, then default implementation will be used. The default behavior is
+ * described in {@link GridCacheAffinityKeyMapper} documentation.
+ *
+ * @param affMapper Affinity mapper.
+ */
+ public void setAffinityMapper(GridCacheAffinityKeyMapper affMapper) {
+ this.affMapper = affMapper;
+ }
+
+ /**
+ * Gets name of the SPI to use for indexing. If not specified, the default
+ * indexing SPI will be used.
+ * <p>
+ * This property becomes useful in rare cases when more than one indexing
+ * SPI is configured. In majority of the cases default value should be used.
+ *
+ * @return Name of SPI to use for indexing.
+ * @see GridIndexingSpi
+ */
+ public String getIndexingSpiName() {
+ return indexingSpiName;
+ }
+
+ /**
+ * Sets name of the SPI to use for indexing. If not specified, the default
+ * indexing SPI will be used.
+ * <p>
+ * This property becomes useful in rare cases when more than one indexing
+ * SPI is configured. In majority of the cases default value should be used.
+ *
+ * @param indexingSpiName Name.
+ * @see GridIndexingSpi
+ */
+ public void setIndexingSpiName(String indexingSpiName) {
+ this.indexingSpiName = indexingSpiName;
+ }
+
+ /**
+ * Gets maximum amount of memory available to off-heap storage. Possible values are
+ * <ul>
+ * <li>{@code -1} - Means that off-heap storage is disabled.</li>
+ * <li>
+ * {@code 0} - GridGain will not limit off-heap storage (it's up to user to properly
+ * add and remove entries from cache to ensure that off-heap storage does not grow
+ * indefinitely.
+ * </li>
+ * <li>Any positive value specifies the limit of off-heap storage in bytes.</li>
+ * </ul>
+ * Default value is {@code -1}, specified by {@link #DFLT_OFFHEAP_MEMORY} constant
+ * which means that off-heap storage is disabled by default.
+ * <p>
+ * Use off-heap storage to load gigabytes of data in memory without slowing down
+ * Garbage Collection. Essentially in this case you should allocate very small amount
+ * of memory to JVM and GridGain will cache most of the data in off-heap space
+ * without affecting JVM performance at all.
+ * <p>
+ * Note that GridGain will throw an exception if max memory is set to {@code -1} and
+ * {@code offHeapValuesOnly} flag is set to {@code true}.
+ *
+ * @return Maximum memory in bytes available to off-heap memory space.
+ */
+ public long getOffHeapMaxMemory() {
+ return offHeapMaxMem;
+ }
+
+ /**
+ * Sets maximum amount of memory available to off-heap storage. Possible values are <ul> <li>{@code -1} - Means that
+ * off-heap storage is disabled.</li> <li> {@code 0} - GridGain will not limit off-heap storage (it's up to user to
+ * properly add and remove entries from cache to ensure that off-heap storage does not grow infinitely. </li>
+ * <li>Any positive value specifies the limit of off-heap storage in bytes.</li> </ul> Default value is {@code -1},
+ * specified by {@link #DFLT_OFFHEAP_MEMORY} constant which means that off-heap storage is disabled by default. <p>
+ * Use off-heap storage to load gigabytes of data in memory without slowing down Garbage Collection. Essentially in
+ * this case you should allocate very small amount of memory to JVM and GridGain will cache most of the data in
+ * off-heap space without affecting JVM performance at all.
+ *
+ * @param offHeapMaxMem Maximum memory in bytes available to off-heap memory space.
+ */
+ public void setOffHeapMaxMemory(long offHeapMaxMem) {
+ this.offHeapMaxMem = offHeapMaxMem;
+ }
+
+ /**
+ * Gets maximum number of query iterators that can be stored. Iterators are stored to
+ * support query pagination when each page of data is sent to user's node only on demand.
+ * Increase this property if you are running and processing lots of queries in parallel.
+ * <p>
+ * Default value is {@link #DFLT_MAX_QUERY_ITERATOR_CNT}.
+ *
+ * @return Maximum number of query iterators that can be stored.
+ */
+ public int getMaximumQueryIteratorCount() {
+ return maxQryIterCnt;
+ }
+
+ /**
+ * Sets maximum number of query iterators that can be stored.
+ *
+ * @param maxQryIterCnt Maximum number of query iterators that can be stored.
+ */
+ public void setMaximumQueryIteratorCount(int maxQryIterCnt) {
+ this.maxQryIterCnt = maxQryIterCnt;
+ }
+
+ /**
+ * Gets maximum number of entries that can be accumulated before back-pressure
+ * is enabled to postpone cache updates until query listeners are notified.
+ * If your system is configured properly, then this number should never be reached.
+ * <p>
+ * Default value is {@link #DFLT_CONT_QUERY_QUEUE_SIZE}.
+ *
+ * @return Continuous query queue size.
+ * @deprecated Ignored in current version.
+ */
+ @Deprecated
+ public int getContinuousQueryQueueSize() {
+ return 0;
+ }
+
+ /**
+ * Sets continuous query queue size.
+ *
+ * @param contQryQueueSize Continuous query queue size.
+ * @deprecated Ignored in current version.
+ */
+ @Deprecated
+ public void setContinuousQueryQueueSize(int contQryQueueSize) {
+ // No-op.
+ }
+
+ /**
+ * Gets memory mode for cache. Memory mode helps control whether value is stored in on-heap memory,
+ * off-heap memory, or swap space. Refer to {@link GridCacheMemoryMode} for more info.
+ * <p>
+ * Default value is {@link #DFLT_MEMORY_MODE}.
+ *
+ * @return Memory mode.
+ */
+ public GridCacheMemoryMode getMemoryMode() {
+ return memMode;
+ }
+
+ /**
+ * Sets memory mode for cache.
+ *
+ * @param memMode Memory mode.
+ */
+ public void setMemoryMode(GridCacheMemoryMode memMode) {
+ this.memMode = memMode;
+ }
+
+ /**
+ * Gets the maximum buffer size for continuous queries. When the current
+ * number of entries in buffer exceeds the maximum buffer size, the buffer
+ * is flushed to the notification queue. Greater buffer size may improve throughput,
+ * but also may increase latency.
+ * <p>
+ * Default value is either {@link #DFLT_CONT_QUERY_MAX_BUF_SIZE} or
+ * {@code GG_CONT_QUERY_MAX_BUF_SIZE} system property value (if specified).
+ *
+ * @return Maximum buffer size for continuous queries.
+ * @deprecated Ignored in current version.
+ */
+ @Deprecated
+ public int getContinuousQueryMaximumBufferSize() {
+ return 0;
+ }
+
+ /**
+ * Sets maximum buffer size for continuous queries.
+ *
+ * @param contQryMaxBufSize Maximum buffer size for continuous queries.
+ * @deprecated Ignored in current version.
+ */
+ @Deprecated
+ public void setContinuousQueryMaximumBufferSize(int contQryMaxBufSize) {
+ // No-op.
+ }
+
+ /**
+ * Gets cache interceptor.
+ *
+ * @return Cache interceptor.
+ */
+ @SuppressWarnings({"unchecked"})
+ @Nullable public <K, V> GridCacheInterceptor<K, V> getInterceptor() {
+ return (GridCacheInterceptor<K, V>)interceptor;
+ }
+
+ /**
+ * Sets cache interceptor.
+ *
+ * @param interceptor Cache interceptor.
+ */
+ public <K, V> void setInterceptor(GridCacheInterceptor<K, V> interceptor) {
+ this.interceptor = interceptor;
+ }
+
+ /**
+ * Flag indicating whether GridGain should store portable keys and values
+ * as instances of {@link PortableObject}.
+ *
+ * @return Portable enabled flag.
+ */
+ public boolean isPortableEnabled() {
+ return portableEnabled;
+ }
+
+ /**
+ * Gets portable enabled flag value.
+ *
+ * @param portableEnabled Portable enabled flag value.
+ */
+ public void setPortableEnabled(boolean portableEnabled) {
+ this.portableEnabled = portableEnabled;
+ }
+
+ /**
+ * Flag indicating that {@link CacheStore} implementation
+ * is working with portable objects instead of Java objects
+ * if portable mode for this cache is enabled ({@link #isPortableEnabled()}
+ * flag is {@code true}). Default value of this flag is {@code true},
+ * because this is recommended behavior from performance standpoint.
+ * <p>
+ * If set to {@code false}, GridGain will deserialize keys and
+ * values stored in portable format before they are passed
+ * to cache store.
+ * <p>
+ * Note that setting this flag to {@code false} can simplify
+ * store implementation in some cases, but it can cause performance
+ * degradation due to additional serializations and deserializations
+ * of portable objects. You will also need to have key and value
+ * classes on all nodes since portables will be deserialized when
+ * store is called.
+ * <p>
+ * This flag is ignored if portable mode is disabled for this
+ * cache ({@link #isPortableEnabled()} flag is {@code false}).
+ *
+ * @return Keep portables in store flag.
+ */
+ public boolean isKeepPortableInStore() {
+ return keepPortableInStore;
+ }
+
+ /**
+ * Sets keep portables in store flag.
+ *
+ * @param keepPortableInStore Keep portables in store flag.
+ */
+ public void setKeepPortableInStore(boolean keepPortableInStore) {
+ this.keepPortableInStore = keepPortableInStore;
+ }
+
+ /**
+ * Gets query configuration. Query configuration defines which fields should be indexed for objects
+ * without annotations or portable objects.
+ *
+ * @return Cache query configuration.
+ */
+ public GridCacheQueryConfiguration getQueryConfiguration() {
+ return qryCfg;
+ }
+
+ /**
+ * Sets query configuration.
+ *
+ * @param qryCfg Query configuration.
+ * @see GridCacheQueryConfiguration
+ */
+ public void setQueryConfiguration(GridCacheQueryConfiguration qryCfg) {
+ this.qryCfg = qryCfg;
+ }
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(CacheConfiguration.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java
index 1e5076f..bd44880 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java
@@ -45,7 +45,7 @@ public enum CacheFlag {
* messages will be sent to set the values to {@code null}.
*
* @see IgniteTx#isInvalidate()
- * @see org.gridgain.grid.cache.GridCacheConfiguration#isInvalidate()
+ * @see CacheConfiguration#isInvalidate()
*/
INVALIDATE,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index 4cdfe5a..f44d79a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -35,7 +35,7 @@ import static javax.cache.Cache.*;
/**
* API for cache persistent storage for read-through and write-through behavior.
- * Persistent store is configured via {@link GridCacheConfiguration#getStore()}
+ * Persistent store is configured via {@link org.apache.ignite.cache.CacheConfiguration#getStore()}
* configuration property. If not provided, values will be only kept in cache memory
* or swap storage without ever being persisted to a persistent storage.
* <p>
@@ -70,7 +70,7 @@ import static javax.cache.Cache.*;
* }
* </pre>
* <h1 class="header">Working With Portable Objects</h1>
- * When portables are enabled for cache by setting {@link GridCacheConfiguration#isPortableEnabled()} to
+ * When portables are enabled for cache by setting {@link org.apache.ignite.cache.CacheConfiguration#isPortableEnabled()} to
* {@code true}), all portable keys and values are converted to instances of {@link PortableObject}.
* Therefore, all cache store methods will take parameters in portable format. To avoid class
* cast exceptions, store must have signature compatible with portables. E.g., if you use {@link Integer}
@@ -85,7 +85,7 @@ import static javax.cache.Cache.*;
* ...
* }
* </pre>
- * This behavior can be overridden by setting {@link GridCacheConfiguration#setKeepPortableInStore(boolean)}
+ * This behavior can be overridden by setting {@link org.apache.ignite.cache.CacheConfiguration#setKeepPortableInStore(boolean)}
* flag value to {@code false}. In this case, GridGain will deserialize keys and values stored in portable
* format before they are passed to cache store, so that you can use the following cache store signature instead:
* <pre name="code" class="java">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreBalancingWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreBalancingWrapper.java
index c76d4ec..e8430aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreBalancingWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreBalancingWrapper.java
@@ -109,6 +109,8 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> {
/** {@inheritDoc} */
@Override public Map<K, V> loadAll(Iterable<? extends K> keys) throws CacheLoaderException {
+ assert false;
+
return delegate.loadAll(keys);
}
@@ -117,7 +119,7 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> {
* @param c Closure for loaded values.
*/
public void loadAll(Collection<? extends K> keys, final IgniteBiInClosure<K, V> c) {
- assert keys.size() < loadAllThreshold;
+ assert keys.size() <= loadAllThreshold : loadAllThreshold;
Collection<K> needLoad = null;
Map<K, LoadFuture> pending = null;
@@ -161,8 +163,10 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> {
try {
Map<K, V> loaded = delegate.loadAll(needLoad);
- for (Map.Entry<K, V> e : loaded.entrySet())
- c.apply(e.getKey(), e.getValue());
+ if (loaded != null) {
+ for (Map.Entry<K, V> e : loaded.entrySet())
+ c.apply(e.getKey(), e.getValue());
+ }
span.onComplete(needLoad, loaded);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
index 2331e02..0fb5c47 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
@@ -34,5 +34,5 @@ public interface CacheStoreSession {
/**
* @return Session properties.
*/
- public Map<Object, Object> properties();
+ public <K, V> Map<K, V> properties();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
index 8c13db9..394a5ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
@@ -29,6 +29,7 @@ import org.gridgain.grid.util.typedef.internal.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import javax.cache.integration.*;
import javax.sql.*;
import java.sql.*;
@@ -239,11 +240,14 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void put(K key, V val) {
+ @Override public void write(Cache.Entry<? extends K, ? extends V> entry) {
init();
IgniteTx tx = transaction();
+ K key = entry.getKey();
+ V val = entry.getValue();
+
if (log.isDebugEnabled())
log.debug("Store put [key=" + key + ", val=" + val + ", tx=" + tx + ']');
@@ -279,7 +283,7 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void remove(K key) {
+ @Override public void delete(Object key) {
init();
IgniteTx tx = transaction();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 345f8d7..0c56c51 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -18,6 +18,7 @@
package org.apache.ignite.configuration;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.events.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.lang.*;
@@ -30,7 +31,6 @@ import org.apache.ignite.spi.authentication.*;
import org.apache.ignite.spi.indexing.*;
import org.apache.ignite.streamer.*;
import org.gridgain.client.ssl.*;
-import org.gridgain.grid.cache.*;
import org.gridgain.grid.dotnet.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.managers.eventstorage.*;
@@ -384,7 +384,7 @@ public class IgniteConfiguration {
private IgniteAddressResolver addrRslvr;
/** Cache configurations. */
- private GridCacheConfiguration[] cacheCfg;
+ private CacheConfiguration[] cacheCfg;
/** Transactions configuration. */
private TransactionsConfiguration txCfg = new TransactionsConfiguration();
@@ -2241,7 +2241,7 @@ public class IgniteConfiguration {
*
* @return Array of fully initialized cache descriptors.
*/
- public GridCacheConfiguration[] getCacheConfiguration() {
+ public CacheConfiguration[] getCacheConfiguration() {
return cacheCfg;
}
@@ -2251,8 +2251,8 @@ public class IgniteConfiguration {
* @param cacheCfg Cache configurations.
*/
@SuppressWarnings({"ZeroLengthArrayAllocation"})
- public void setCacheConfiguration(GridCacheConfiguration... cacheCfg) {
- this.cacheCfg = cacheCfg == null ? new GridCacheConfiguration[0] : cacheCfg;
+ public void setCacheConfiguration(CacheConfiguration... cacheCfg) {
+ this.cacheCfg = cacheCfg == null ? new CacheConfiguration[0] : cacheCfg;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index f95cd2a..cca2946 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -99,7 +99,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements
/** {@inheritDoc} */
@Override public <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz) {
- GridCacheConfiguration cfg = ctx.config();
+ CacheConfiguration cfg = ctx.config();
if (!clazz.isAssignableFrom(cfg.getClass()))
throw new IllegalArgumentException();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java
index 8b843f3..3f16f2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java
@@ -18,13 +18,12 @@
package org.apache.ignite.resources;
import java.lang.annotation.*;
-import org.gridgain.grid.cache.*;
/**
* Annotates a field or a setter method for injection of grid cache name.
- * Grid cache name is provided to cache via {@link GridCacheConfiguration#getName()} method.
+ * Grid cache name is provided to cache via {@link org.apache.ignite.cache.CacheConfiguration#getName()} method.
* <p>
- * Cache name can be injected into components provided in the {@link GridCacheConfiguration},
+ * Cache name can be injected into components provided in the {@link org.apache.ignite.cache.CacheConfiguration},
* if {@link IgniteCacheNameResource} annotation is used in another classes it is no-op.
* <p>
* Here is how injection would typically happen:
@@ -50,7 +49,7 @@ import org.gridgain.grid.cache.*;
* }
* </pre>
* <p>
- * See {@link GridCacheConfiguration#getName()} for cache configuration details.
+ * See {@link org.apache.ignite.cache.CacheConfiguration#getName()} for cache configuration details.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
index 80409f4..263747a 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
@@ -19,7 +19,6 @@ package org.apache.ignite.transactions;
import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import java.util.*;
@@ -67,7 +66,7 @@ import java.util.*;
* all nodes reply {@code 'OK'} (i.e. {@code Phase 1} completes successfully), a one-way' {@code 'COMMIT'}
* message is sent without waiting for reply. If it is necessary to know whenever remote nodes have committed
* as well, synchronous commit or synchronous rollback should be enabled via
- * {@link GridCacheConfiguration#setWriteSynchronizationMode}
+ * {@link org.apache.ignite.cache.CacheConfiguration#setWriteSynchronizationMode}
* or by setting proper flags on cache projection, such as {@link GridCacheFlag#SYNC_COMMIT}.
* <p>
* Note that in this mode, optimistic failures are only possible in conjunction with
@@ -114,7 +113,7 @@ import java.util.*;
* }
* </pre>
*/
-public interface IgniteTx extends GridMetadataAware, AutoCloseable, IgniteAsyncSupport {
+public interface IgniteTx extends AutoCloseable, IgniteAsyncSupport {
/**
* Gets unique identifier for this transaction.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
index 8639b5f..40b94e8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
@@ -18,6 +18,7 @@
package org.gridgain.grid;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.logger.*;
@@ -341,14 +342,14 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
cp.setClientConnectionConfiguration(null);
- Collection<GridCacheConfiguration> reduced = new ArrayList<>();
+ Collection<CacheConfiguration> reduced = new ArrayList<>();
- for (GridCacheConfiguration ccfg : gridCfg.getCacheConfiguration()) {
+ for (CacheConfiguration ccfg : gridCfg.getCacheConfiguration()) {
if (CU.isSystemCache(ccfg.getName()))
continue;
if (!matches(reduced, ccfg)) {
- GridCacheConfiguration ccfgCp = new GridCacheConfiguration(ccfg);
+ CacheConfiguration ccfgCp = new CacheConfiguration(ccfg);
if (ccfgCp.getDistributionMode() == GridCacheDistributionMode.CLIENT_ONLY)
ccfgCp.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY);
@@ -365,7 +366,7 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
if (F.isEmpty(reduced))
return null;
- GridCacheConfiguration[] res = new GridCacheConfiguration[reduced.size()];
+ CacheConfiguration[] res = new CacheConfiguration[reduced.size()];
reduced.toArray(res);
@@ -381,8 +382,8 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
* @param ccfg Cache configuration to match.
* @return {@code True} if matching configuration is found, {@code false} otherwise.
*/
- private boolean matches(Iterable<GridCacheConfiguration> reduced, GridCacheConfiguration ccfg) {
- for (GridCacheConfiguration ccfg0 : reduced) {
+ private boolean matches(Iterable<CacheConfiguration> reduced, CacheConfiguration ccfg) {
+ for (CacheConfiguration ccfg0 : reduced) {
if (matches(ccfg0, ccfg))
return true;
}
@@ -397,7 +398,7 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
* @param ccfg1 Second configuration.
* @return {@code True} if configurations match.
*/
- private boolean matches(GridCacheConfiguration ccfg0, GridCacheConfiguration ccfg1) {
+ private boolean matches(CacheConfiguration ccfg0, CacheConfiguration ccfg1) {
return
F.eq(ccfg0.getCacheMode(), ccfg1.getCacheMode()) &&
F.eq(ccfg0.getBackups(), ccfg1.getBackups()) &&
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
index 95a002b..d003bf1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.cache;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*;
import org.gridgain.grid.cache.affinity.*;
@@ -65,7 +66,7 @@ public interface GridCache<K, V> extends GridCacheProjection<K, V> {
*
* @return Configuration bean for this cache.
*/
- public GridCacheConfiguration configuration();
+ public CacheConfiguration configuration();
/**
* Registers transactions synchronizations for all transactions started by this cache.
@@ -251,7 +252,7 @@ public interface GridCache<K, V> extends GridCacheProjection<K, V> {
/**
* Forces this cache node to re-balance its partitions. This method is usually used when
- * {@link GridCacheConfiguration#getPreloadPartitionedDelay()} configuration parameter has non-zero value.
+ * {@link org.apache.ignite.cache.CacheConfiguration#getPreloadPartitionedDelay()} configuration parameter has non-zero value.
* When many nodes are started or stopped almost concurrently, it is more efficient to delay
* preloading until the node topology is stable to make sure that no redundant re-partitioning
* happens.
@@ -259,12 +260,12 @@ public interface GridCache<K, V> extends GridCacheProjection<K, V> {
* In case of{@link GridCacheMode#PARTITIONED} caches, for better efficiency user should
* usually make sure that new nodes get placed on the same place of consistent hash ring as
* the left nodes, and that nodes are restarted before
- * {@link GridCacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes
+ * {@link org.apache.ignite.cache.CacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes
* on the same place in consistent hash ring, use
* {@link GridCacheConsistentHashAffinityFunction#setHashIdResolver(GridCacheAffinityNodeHashResolver)} to make sure that
* a node maps to the same hash ID if re-started.
* <p>
- * See {@link GridCacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure
+ * See {@link org.apache.ignite.cache.CacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure
* preload re-partition delay.
* <p>
* @return Future that will be completed when preloading is finished.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheAtomicityMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheAtomicityMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheAtomicityMode.java
index 8098409..21cf540 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheAtomicityMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheAtomicityMode.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
* used whenever transactions and explicit locking are not needed. Note that in {@link #ATOMIC}
* mode cache will still maintain full data consistency across all cache nodes.
* <p>
- * Cache atomicity may be set via {@link GridCacheConfiguration#getAtomicityMode()}
+ * Cache atomicity may be set via {@link org.apache.ignite.cache.CacheConfiguration#getAtomicityMode()}
* configuration property.
*/
public enum GridCacheAtomicityMode {