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);
