http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java index a552593..d34e3d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java @@ -28,9 +28,9 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -48,7 +48,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe private static final int GRID_COUNT = 2; /** Cache atomicity mode specified by test. */ - private GridCacheAtomicityMode atomicityMode; + private CacheAtomicityMode atomicityMode; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java index d536236..3321267 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java @@ -26,9 +26,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -49,10 +49,10 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb private int cnt; /** Caching mode specified by test. */ - private GridCacheMode cacheMode; + private CacheMode cacheMode; /** Cache atomicity mode specified by test. */ - private GridCacheAtomicityMode atomicityMode; + private CacheAtomicityMode atomicityMode; /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java index 73f4530..d35a1bc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -34,17 +34,17 @@ public class IgniteCacheAtomicExpiryPolicyTest extends IgniteCacheExpiryPolicyAb } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return CLOCK; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java index 4215766..883e6c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheAtomicLocalExpiryPolicyTest extends IgniteCacheExpiryPol } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java index fc3054d..890ec30 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; /** * */ public class IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return PRIMARY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicReplicatedExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicReplicatedExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicReplicatedExpiryPolicyTest.java index 2072cc3..8aacc02 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicReplicatedExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicReplicatedExpiryPolicyTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * */ public class IgniteCacheAtomicReplicatedExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return REPLICATED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 363fbe9..3852460 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 @@ -36,10 +36,10 @@ import java.util.concurrent.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java index 29da0de..4524064 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxExpiryPolicyTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxExpiryPolicyTest extends IgniteCacheExpiryPolicyAbstra } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java index 118c77f..ccaf809 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxLocalExpiryPolicyTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxLocalExpiryPolicyTest extends IgniteCacheExpiryPolicyA } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedExpiryPolicyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedExpiryPolicyTest.java index eb165db..0eef5d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedExpiryPolicyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxReplicatedExpiryPolicyTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * */ public class IgniteCacheTxReplicatedExpiryPolicyTest extends IgniteCacheTxExpiryPolicyTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return REPLICATED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java index 62a5983..608308b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -34,12 +34,12 @@ public class IgniteCacheAtomicLoadAllTest extends IgniteCacheLoadAllAbstractTest } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } @@ -49,7 +49,7 @@ public class IgniteCacheAtomicLoadAllTest extends IgniteCacheLoadAllAbstractTest } /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return PRIMARY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java index e4fadad..88fd929 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -34,17 +34,17 @@ public class IgniteCacheAtomicLoaderWriterTest extends IgniteCacheLoaderWriterAb } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return PRIMARY; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java index e5d345d..d2302af 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalLoadAllTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheAtomicLocalLoadAllTest extends IgniteCacheLoadAllAbstrac } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java index f117c68..b0806f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoLoadPreviousValueTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheAtomicLocalNoLoadPreviousValueTest extends IgniteCacheNo } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java index c5bf75e..84c74ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheAtomicLocalNoReadThroughTest extends IgniteCacheNoReadTh } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java index 2f83998..34bef7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoWriteThroughTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheAtomicLocalNoWriteThroughTest extends IgniteCacheNoWrite } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java index deeefdf..429348d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -34,12 +34,12 @@ public class IgniteCacheAtomicNoLoadPreviousValueTest extends IgniteCacheNoLoadP } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } @@ -49,7 +49,7 @@ public class IgniteCacheAtomicNoLoadPreviousValueTest extends IgniteCacheNoLoadP } /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return PRIMARY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java index 6baa7b1..fc05c33 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -34,12 +34,12 @@ public class IgniteCacheAtomicNoReadThroughTest extends IgniteCacheNoReadThrough } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } @@ -49,7 +49,7 @@ public class IgniteCacheAtomicNoReadThroughTest extends IgniteCacheNoReadThrough } /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return PRIMARY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java index 9b25a40..ba25849 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -34,12 +34,12 @@ public class IgniteCacheAtomicNoWriteThroughTest extends IgniteCacheNoWriteThrou } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } @@ -49,7 +49,7 @@ public class IgniteCacheAtomicNoWriteThroughTest extends IgniteCacheNoWriteThrou } /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return PRIMARY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java index 6217a7c..03af75f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -34,12 +34,12 @@ public class IgniteCacheAtomicStoreSessionTest extends IgniteCacheStoreSessionAb } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } @@ -49,7 +49,7 @@ public class IgniteCacheAtomicStoreSessionTest extends IgniteCacheStoreSessionAb } /** {@inheritDoc} */ - @Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return PRIMARY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java index 6287565..5beb191 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; @@ -27,8 +26,8 @@ import org.apache.ignite.transactions.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Test for configuration property {@link CacheConfiguration#isLoadPreviousValue()}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java index bf48b18..02fecb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java @@ -30,8 +30,8 @@ import javax.cache.integration.*; import javax.cache.processor.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Test for configuration property {@link CacheConfiguration#isReadThrough}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java index 54c4f5f..96d1e3f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java @@ -28,8 +28,8 @@ import org.apache.ignite.transactions.*; import javax.cache.processor.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Test for configuration property {@link CacheConfiguration#isWriteThrough}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java index 45d4ef3..6af2040 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java @@ -15,7 +15,7 @@ import javax.cache.integration.*; import javax.cache.processor.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java index 9565d63..602aea0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoadAllTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxLoadAllTest extends IgniteCacheLoadAllAbstractTest { } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java index 3bc7b23..93b97ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxLoaderWriterTest extends IgniteCacheLoaderWriterAbstra } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java index f3aa5e4..f4b02b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxLocalLoadAllTest extends IgniteCacheLoadAllAbstractTes } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java index 88d9975..519374c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxLocalNoLoadPreviousValueTest extends IgniteCacheNoLoad } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java index 4a9c02c..0929372 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxLocalNoReadThroughTest extends IgniteCacheNoReadThroug } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java index a801cbd..5800bd8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxLocalNoWriteThroughTest extends IgniteCacheNoWriteThro } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java index b439c7b..3e8f3a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxNoLoadPreviousValueTest extends IgniteCacheNoLoadPrevi } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java index 9f14f5c..bff1a47 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxNoReadThroughTest extends IgniteCacheNoReadThroughAbst } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java index a490313..7ad7d52 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -33,12 +33,12 @@ public class IgniteCacheTxNoWriteThroughTest extends IgniteCacheNoWriteThroughAb } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java index c10c7f5..74ba31e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java @@ -26,9 +26,9 @@ import java.util.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * @@ -40,12 +40,12 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java index f6e091e..973f3b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Local atomic cache metrics test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java index 69bc0d7..592c44c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java @@ -21,14 +21,14 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests local cache with daemon node. */ public class GridCacheDaemonNodeLocalSelfTest extends GridCacheDaemonNodeAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheExLocalFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheExLocalFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheExLocalFullApiSelfTest.java index ea862f0..71c0495 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheExLocalFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheExLocalFullApiSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.*; * Tests private cache interface on local cache. */ public class GridCacheExLocalFullApiSelfTest extends GridCacheExAbstractFullApiSelfTest { - @Override protected GridCacheMode cacheMode() { - return GridCacheMode.LOCAL; + @Override protected CacheMode cacheMode() { + return CacheMode.LOCAL; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicBasicStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicBasicStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicBasicStoreSelfTest.java index 4750745..76c2092 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicBasicStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicBasicStoreSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Test store with local cache in atomic mode. */ public class GridCacheLocalAtomicBasicStoreSelfTest extends GridCacheLocalBasicStoreSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicFullApiSelfTest.java index 2a216e2..3434908 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicFullApiSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Tests for local atomic cache. */ public class GridCacheLocalAtomicFullApiSelfTest extends GridCacheLocalFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicGetAndTransformStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicGetAndTransformStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicGetAndTransformStoreSelfTest.java index 28d70d2..01c178a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicGetAndTransformStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicGetAndTransformStoreSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Test get and transform fro store with local cache in atomic mode. @@ -27,7 +27,7 @@ import static org.apache.ignite.cache.GridCacheAtomicityMode.*; public class GridCacheLocalAtomicGetAndTransformStoreSelfTest extends GridCacheLocalGetAndTransformStoreSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java index e84d72a..6665150 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicOffHeapFullApiSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Tests local cache in atomic mode with values being stored offheap. */ public class GridCacheLocalAtomicOffHeapFullApiSelfTest extends GridCacheLocalOffHeapFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicProjectionSelfTest.java index db450d6..464e862 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicProjectionSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Projection tests for local cache in atomic mode. */ public class GridCacheLocalAtomicProjectionSelfTest extends GridCacheLocalProjectionSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java index 22eb911..e04a95d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Basic API tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreMultithreadedSelfTest.java index bde6e25..628022c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreMultithreadedSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.*; * Local test. */ public class GridCacheLocalBasicStoreMultithreadedSelfTest extends GridCacheBasicStoreMultithreadedAbstractTest { - @Override protected GridCacheMode cacheMode() { - return GridCacheMode.LOCAL; + @Override protected CacheMode cacheMode() { + return CacheMode.LOCAL; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java index 7645e9f..3fa73c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Test store with local cache. */ public class GridCacheLocalBasicStoreSelfTest extends GridCacheBasicStoreAbstractTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index af952be..48ea2f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -28,9 +28,9 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheMemoryMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; 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/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java index 0bb6005..afb2709 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests events. */ public class GridCacheLocalEventSelfTest extends GridCacheEventAbstractTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java index c3456d6..c3d3cb5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java @@ -20,19 +20,19 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Tests local cache eviction event. */ public class GridCacheLocalEvictionEventSelfTest extends GridCacheEvictionEventAbstractTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return GridCacheMode.LOCAL; + @Override protected CacheMode cacheMode() { + return CacheMode.LOCAL; } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java index b6ef30c..887192a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiMultithreadedSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Multithreaded local cache API tests. @@ -32,7 +32,7 @@ public class GridCacheLocalFullApiMultithreadedSelfTest extends GridCacheAbstrac } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java index b1487fc..12d88fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java @@ -27,14 +27,14 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests for local cache. */ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java index 9a6e6f5..3dc2b83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Test get and transform for store with local cache. */ public class GridCacheLocalGetAndTransformStoreSelfTest extends GridCacheGetAndTransformStoreAbstractTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java index 815835c..8d97400 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.*; import java.io.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests for local cache iterators. @@ -35,7 +35,7 @@ public class GridCacheLocalIteratorsSelfTest extends GridCacheAbstractIteratorsS } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java index fc61d29..8ecfd96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java @@ -30,7 +30,7 @@ import javax.cache.*; import javax.cache.configuration.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Load-All self test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java index 455c141..2b121d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Test cases for multi-threaded tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMetricsSelfTest.java index a52fad1..54dea01 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMetricsSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Local cache metrics test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java index b6f756f..7d2860c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java @@ -30,7 +30,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Multithreaded local cache locking test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalProjectionSelfTest.java index c7b87a9..682bda0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalProjectionSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Projection tests for local cache. */ public class GridCacheLocalProjectionSelfTest extends GridCacheAbstractProjectionSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java index 4b13ce0..e825da5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; -import static org.apache.ignite.cache.GridCacheMode.LOCAL; +import static org.apache.ignite.cache.CacheMode.LOCAL; /** * Tests local cache. @@ -32,7 +32,7 @@ public class GridCacheLocalTxExceptionSelfTest extends IgniteTxExceptionAbstract } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } }
