Repository: incubator-ignite Updated Branches: refs/heads/ignite-63 531d9ba3f -> cafee25f9
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 58e974a..41b28a7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -30,7 +30,7 @@ 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.GridCachePreloadMode.*; @@ -56,8 +56,8 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { c.setMarshaller(new IgniteOptimizedMarshaller(false)); - c.setCacheConfiguration(createCache("replicated", GridCacheMode.REPLICATED), - createCache("partitioned", GridCacheMode.PARTITIONED)); + c.setCacheConfiguration(createCache("replicated", CacheMode.REPLICATED), + createCache("partitioned", CacheMode.PARTITIONED)); return c; } @@ -81,7 +81,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { * @param mode Cache mode. * @return Cache configuration. */ - private static CacheConfiguration createCache(String name, GridCacheMode mode) { + private static CacheConfiguration createCache(String name, CacheMode mode) { CacheConfiguration cc = defaultCacheConfiguration(); cc.setName(name); @@ -209,7 +209,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * Represents a product available for purchase. In our {@code snowflake} schema a {@code product} is a {@code - * 'dimension'} and will be cached in {@link GridCacheMode#REPLICATED} cache. + * 'dimension'} and will be cached in {@link org.apache.ignite.cache.CacheMode#REPLICATED} cache. */ private static class DimProduct { /** Primary key. */ @@ -251,7 +251,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * Represents a physical store location. In our {@code snowflake} schema a {@code store} is a {@code 'dimension'} - * and will be cached in {@link GridCacheMode#REPLICATED} cache. + * and will be cached in {@link org.apache.ignite.cache.CacheMode#REPLICATED} cache. */ private static class DimStore { /** Primary key. */ @@ -294,7 +294,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * Represents a purchase record. In our {@code snowflake} schema purchase is a {@code 'fact'} and will be cached in - * larger {@link GridCacheMode#PARTITIONED} cache. + * larger {@link org.apache.ignite.cache.CacheMode#PARTITIONED} cache. */ private static class FactPurchase { /** Primary key. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 34c245a..39f6073 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -39,9 +38,9 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.events.IgniteEventType.*; -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.GridCachePeekMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java index db421c0..cc2028d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -37,7 +37,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.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java index 3f7e6b0..94f8cef 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** @@ -38,7 +38,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { private static final int GRID_CNT = 2; /** */ - private static final GridCacheMode CACHE_MODE = REPLICATED; + private static final CacheMode CACHE_MODE = REPLICATED; /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 2939031..06e8858 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -40,8 +40,8 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -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.*; /** * Multi-threaded tests for cache queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index b67d99c..032bd44 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -28,7 +28,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.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java index a1acfd5..93f0cc5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java @@ -30,9 +30,9 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -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.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index 11139dd..17b3b76 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 5602fb9..2a5262b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -31,8 +31,8 @@ import org.apache.ignite.testframework.junits.common.*; 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.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java index 62fc50e..bb55f6a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** @@ -32,7 +32,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheAtomicFieldsQuerySelfTest extends GridCachePartitionedFieldsQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java index 218d54c..cdfdf3a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; 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.*; /** @@ -27,7 +27,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheAtomicNearEnabledQuerySelfTest extends GridCachePartitionedQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java index 6156874..a128335 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; 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.*; /** @@ -27,7 +27,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheAtomicQuerySelfTest extends GridCachePartitionedQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java index 1a3b3a2..fac5c86 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java @@ -26,14 +26,14 @@ import org.jetbrains.annotations.*; import java.util.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests for fields queries. */ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFieldsQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 81886da..b5966c7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -33,7 +33,7 @@ import javax.cache.processor.*; import java.util.*; 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.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index d5813cb..01f4022 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests for partitioned cache queries. @@ -39,7 +39,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index e66c6e7..eaadc06 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -34,9 +34,9 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -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.*; /** * Test for distributed queries with node restarts. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java index 13b70f9..e9458f8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java @@ -35,14 +35,14 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests for fields queries. */ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFieldsQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return REPLICATED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index aa6f861..f45b62a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -43,7 +43,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests replicated query. @@ -88,7 +88,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return REPLICATED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java index eb6039b..2e83e63 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.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 query for local cache in atomic mode. */ public class GridCacheLocalAtomicQuerySelfTest extends GridCacheLocalQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { + @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java index 4f9d917..1a0b924 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.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.*; /** * Tests for fields queries. */ public class GridCacheLocalFieldsQuerySelfTest extends GridCacheAbstractFieldsQuerySelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java index fdb059c..b59c410 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.lang.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Tests local query. @@ -36,7 +36,7 @@ public class GridCacheLocalQuerySelfTest extends GridCacheAbstractQuerySelfTest } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 753112c..16d3e7e 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 @@ -38,7 +38,7 @@ import java.util.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java index bf365f2..6b0259a 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.*; import javax.transaction.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Configuration validation test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java index 7f83e69..9502b64 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java @@ -26,7 +26,7 @@ import org.objectweb.jotm.*; import javax.transaction.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxState.*; /** @@ -59,7 +59,7 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest { } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedJtaSelfTest.java index 8760305..ebf93ff 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedJtaSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * JTA integration test using REPLICATED cache. */ public class GridCacheReplicatedJtaSelfTest extends GridCacheJtaSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return REPLICATED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java index 0e8b8b9..7fd560f 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.*; import javax.transaction.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Test for {@link org.apache.ignite.lifecycle.LifecycleAware} support for {@link org.apache.ignite.cache.jta.GridCacheTmLookup}. @@ -70,7 +70,7 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa ccfg.setDistributionMode(distroMode); - ccfg.setCacheMode(GridCacheMode.PARTITIONED); + ccfg.setCacheMode(CacheMode.PARTITIONED); ccfg.setName(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala index 42fff0a..0f268f0 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala @@ -435,9 +435,9 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy /** * Removes given key mapping from cache. If cache previously contained value for the given key, - * then this value is returned. Otherwise, in case of `GridCacheMode#REPLICATED` caches, + * then this value is returned. Otherwise, in case of `CacheMode#REPLICATED` caches, * the value will be loaded from swap and, if it's not there, and read-through is allowed, - * from the underlying `GridCacheStore` storage. In case of `GridCacheMode#PARTITIONED` + * from the underlying `GridCacheStore` storage. In case of `CacheMode#PARTITIONED` * caches, the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap and read-through is allowed, * from the underlying persistent storage. If value has to be loaded from persistent @@ -470,9 +470,9 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy /** * Removes given key mapping from cache. If cache previously contained value for the given key, - * then this value is returned. Otherwise, in case of `GridCacheMode#REPLICATED` caches, + * then this value is returned. Otherwise, in case of `CacheMode#REPLICATED` caches, * the value will be loaded from swap and, if it's not there, and read-through is allowed, - * from the underlying `GridCacheStore` storage. In case of `GridCacheMode#PARTITIONED` + * from the underlying `GridCacheStore` storage. In case of `CacheMode#PARTITIONED` * caches, the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap and read-through is allowed, * from the underlying persistent storage. If value has to be loaded from persistent http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java index 578de03..4152113 100644 --- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java @@ -94,7 +94,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { if (gridName.contains("testCacheRedeployVersionChangeContinuousMode")) { CacheConfiguration cacheCfg = new CacheConfiguration(); - cacheCfg.setCacheMode(GridCacheMode.REPLICATED); + cacheCfg.setCacheMode(CacheMode.REPLICATED); cfg.setCacheConfiguration(cacheCfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala index 14ce09e..d0e8b37 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala @@ -18,9 +18,9 @@ package org.apache.ignite.visor.commands.cache import org.apache.ignite.cache.CacheConfiguration -import org.apache.ignite.cache.{GridCacheMode, GridCacheAtomicityMode} -import GridCacheAtomicityMode._ -import GridCacheMode._ +import org.apache.ignite.cache.{CacheMode, CacheAtomicityMode} +import CacheAtomicityMode._ +import CacheMode._ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} import org.apache.ignite.Ignition http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala index e324474..ef7c968 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala @@ -18,8 +18,8 @@ package org.apache.ignite.visor.commands.cache import org.apache.ignite.cache.CacheConfiguration -import org.apache.ignite.cache.GridCacheMode -import GridCacheMode._ +import org.apache.ignite.cache.CacheMode +import CacheMode._ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} import org.apache.ignite.Ignition http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala index 457852c..72b2594 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala @@ -20,7 +20,7 @@ package org.apache.ignite.visor.commands.cswap import org.apache.ignite.cache.CacheConfiguration import org.apache.ignite.Ignition -import org.apache.ignite.cache.GridCacheMode +import org.apache.ignite.cache.CacheMode import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder @@ -65,7 +65,7 @@ class VisorCacheSwapCommandSpec extends VisorRuntimeBaseSpec(2) { val cfg = new CacheConfiguration cfg.setName(name) - cfg.setCacheMode(GridCacheMode.PARTITIONED) + cfg.setCacheMode(CacheMode.PARTITIONED) cfg.setSwapEnabled(true) cfg http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java index 0bbf9ac..91af221 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/GridWebSessionFilter.java @@ -32,8 +32,8 @@ import java.io.*; import java.util.*; import static java.util.concurrent.TimeUnit.*; -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.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -128,13 +128,13 @@ import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; * parameter; if you specify both, the servlet context parameter will be ignored. * <h1 class="header">Web sessions caching and concurrent requests</h1> * If your web application can accept concurrent request for one session, - * consider using {@link org.apache.ignite.cache.GridCacheAtomicityMode#TRANSACTIONAL} cache - * instead of {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. In this case each request + * consider using {@link org.apache.ignite.cache.CacheAtomicityMode#TRANSACTIONAL} cache + * instead of {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC}. In this case each request * be processed inside pessimistic transaction which will guarantee that all * updates will be applied in correct order. This is important, for example, * if you get some attribute from the session, update its value and set new - * value back to the session. In case of {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC} - * cache concurrent requests can get equal value, but {@link org.apache.ignite.cache.GridCacheAtomicityMode#TRANSACTIONAL} + * value back to the session. In case of {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC} + * cache concurrent requests can get equal value, but {@link org.apache.ignite.cache.CacheAtomicityMode#TRANSACTIONAL} * cache will always process such updates one after another. */ public class GridWebSessionFilter implements Filter {
