http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index 1431ec5..490ded9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -36,7 +36,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; -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/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java index 7724c6f..42d7207 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java index 8429da4..5256d37 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java index ac3b8d7..3c93232 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; 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/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java index 8370f78..632ffc3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceApiSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java index 6707477..6e97b64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSequenceMultiNodeSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java index d725ed3..d382ae1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Set failover tests. */ public class GridCachePartitionedSetFailoverSelfTest extends GridCacheSetFailoverAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java index 1813d17..1632a65 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Set tests. */ public class GridCachePartitionedSetSelfTest extends GridCacheSetAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java index 29fa6c9..4bf6ea5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java index 75e9c2c..eabe926 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java index 5b5f516..2dc3379 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicStampedApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java index cd2645c..7cacf42 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.replicated; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Failover tests for cache data structures. @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheMode.*; public class GridCacheReplicatedDataStructuresFailoverSelfTest extends GridCacheAbstractDataStructuresFailoverSelfTest { /** {@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/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java index 47ac5a3..3666fa6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java index 3c825b2..36f6ef9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java index 2a242f9..613a812 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java index 94ae503..1133eaf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceApiSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java index 51e3128..f5b3864 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSequenceMultiNodeSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -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/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java index 0a6a77e..fe153bf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.replicated; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.datastructures.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Set tests. */ public class GridCacheReplicatedSetSelfTest extends GridCacheSetAbstractSelfTest { /** {@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/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java index d01c8f2..4e852ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -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.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index 1b31ec8..66c75b9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -25,8 +25,8 @@ 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.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index 4508d90..565aff7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -37,10 +37,10 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; -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.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** @@ -134,7 +134,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { fail(); } - catch (GridCacheAtomicUpdateTimeoutException ignore) { + catch (CacheAtomicUpdateTimeoutException ignore) { // Expected exception. } } @@ -168,7 +168,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { fail(); } - catch (GridCacheAtomicUpdateTimeoutException ignore) { + catch (CacheAtomicUpdateTimeoutException ignore) { // Expected exception. } } @@ -203,8 +203,8 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { fail(); } catch (IgniteCheckedException e) { - assertTrue("Invalid exception thrown: " + e, X.hasCause(e, GridCacheAtomicUpdateTimeoutException.class) - || X.hasSuppressed(e, GridCacheAtomicUpdateTimeoutException.class)); + assertTrue("Invalid exception thrown: " + e, X.hasCause(e, CacheAtomicUpdateTimeoutException.class) + || X.hasSuppressed(e, CacheAtomicUpdateTimeoutException.class)); } } @@ -238,8 +238,8 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { fail(); } catch (IgniteCheckedException e) { - assertTrue("Invalid exception thrown: " + e, X.hasCause(e, GridCacheAtomicUpdateTimeoutException.class) - || X.hasSuppressed(e, GridCacheAtomicUpdateTimeoutException.class)); + assertTrue("Invalid exception thrown: " + e, X.hasCause(e, CacheAtomicUpdateTimeoutException.class) + || X.hasSuppressed(e, CacheAtomicUpdateTimeoutException.class)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index b4ab685..f80c8c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.*; 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.GridCacheDistributionMode.*; /** @@ -83,7 +83,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java index 078c61e..eb079fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java @@ -26,7 +26,7 @@ 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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -52,7 +52,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac } /** {@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/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java index d7b84b7..25dfca8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java @@ -32,8 +32,8 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return GridCacheMode.PARTITIONED; + @Override protected CacheMode cacheMode() { + return CacheMode.PARTITIONED; } /** {@inheritDoc} */ @@ -42,8 +42,8 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr } /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { - return GridCacheAtomicityMode.ATOMIC; + @Override protected CacheAtomicityMode atomicityMode() { + return CacheAtomicityMode.ATOMIC; } @Override protected CacheConfiguration cacheConfiguration(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/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java index a1e8949..c8a8dc7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -222,7 +222,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemove() throws Exception { // TODO: GG-7578. - if (cache(0).configuration().getCacheMode() == GridCacheMode.REPLICATED) + if (cache(0).configuration().getCacheMode() == CacheMode.REPLICATED) return; runTest( @@ -321,7 +321,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ public void testGetPutRemoveAsync() throws Exception { // TODO: GG-7578. - if (cache(0).configuration().getCacheMode() == GridCacheMode.REPLICATED) + if (cache(0).configuration().getCacheMode() == CacheMode.REPLICATED) return; runTest(new TestCacheRunnable() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index 7f91218..d5ba673 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.*; 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.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -96,7 +96,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { /** * @return Cache mode. */ - protected abstract GridCacheMode cacheMode(); + protected abstract CacheMode cacheMode(); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() 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/distributed/GridCacheMixedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java index ee1de05..014878d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java @@ -42,7 +42,7 @@ public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest { private CacheConfiguration cacheConfiguration(String gridName) { CacheConfiguration cfg = new CacheConfiguration(); - cfg.setCacheMode(GridCacheMode.PARTITIONED); + cfg.setCacheMode(CacheMode.PARTITIONED); if (F.eq(gridName, getTestGridName(0))) cfg.setDistributionMode(GridCacheDistributionMode.NEAR_ONLY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 82a2249..4bd6f54 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -38,8 +38,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -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.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -103,21 +103,21 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra /** * @return Cache mode. */ - protected GridCacheMode cacheMode() { + protected CacheMode cacheMode() { return PARTITIONED; } /** * @return Cache atomicity mode. */ - protected GridCacheAtomicityMode atomicityMode() { + protected CacheAtomicityMode atomicityMode() { return TRANSACTIONAL; } /** * @return Atomic write order mode. */ - protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index ced13d8..5399ea5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -131,7 +131,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac */ public void testPessimisticReadCommitted() throws Throwable { // TODO: GG-7437. - if (cache(0).configuration().getCacheMode() == GridCacheMode.REPLICATED) + if (cache(0).configuration().getCacheMode() == CacheMode.REPLICATED) return; checkTransaction(PESSIMISTIC, READ_COMMITTED); @@ -240,7 +240,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac GridCache<Integer, String> cache = cache(idx); // TODO: GG-7437. - if (cache.configuration().getCacheMode() == GridCacheMode.REPLICATED) + if (cache.configuration().getCacheMode() == CacheMode.REPLICATED) return; cache.put(KEY, VALUE); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java index ae7a6f4..3d1d0de 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.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.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index f5e3c40..fa7a340 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -34,8 +34,8 @@ import javax.cache.*; import javax.cache.configuration.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -102,21 +102,21 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid /** * @return Cache mode. */ - protected GridCacheMode cacheMode() { + protected CacheMode cacheMode() { return PARTITIONED; } /** * @return Atomicity mode. */ - protected GridCacheAtomicityMode atomicityMode() { - return GridCacheAtomicityMode.TRANSACTIONAL; + protected CacheAtomicityMode atomicityMode() { + return CacheAtomicityMode.TRANSACTIONAL; } /** * @return Write order mode for atomic cache. */ - protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + 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/distributed/GridCachePreloadEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java index 5f90929..9333b17 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java @@ -32,8 +32,8 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.events.IgniteEventType.*; -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.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; @@ -66,7 +66,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA /** * @return Cache mode. */ - protected abstract GridCacheMode getCacheMode(); + protected abstract CacheMode getCacheMode(); /** * @return Cache configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index 96fbd26..daf6b99 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -29,9 +29,9 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheConfiguration.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index 641bce8..f0c738f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -35,9 +35,9 @@ import javax.cache.processor.*; import java.io.*; import java.util.*; -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.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -85,10 +85,10 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { private ConcurrentHashSet<IgniteCacheEvent> evts; /** Cache mode. */ - private GridCacheMode cacheMode; + private CacheMode cacheMode; /** Atomicity mode. */ - private GridCacheAtomicityMode atomicityMode; + private CacheAtomicityMode atomicityMode; /** TX concurrency. */ private IgniteTxConcurrency txConcurrency; @@ -155,7 +155,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private void initialize(GridCacheMode cacheMode, GridCacheAtomicityMode atomicityMode, + private void initialize(CacheMode cacheMode, CacheAtomicityMode atomicityMode, IgniteTxConcurrency txConcurrency, IgniteTxIsolation txIsolation) throws Exception { this.cacheMode = cacheMode; this.atomicityMode = atomicityMode; @@ -453,7 +453,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { * @param cacheMode Cache mode. * @throws Exception If failed. */ - private void checkAtomic(GridCacheMode cacheMode) throws Exception { + private void checkAtomic(CacheMode cacheMode) throws Exception { initialize(cacheMode, ATOMIC, null, null); caches[0].invoke(key1, new Transformer()); @@ -476,7 +476,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ - private void checkTx(GridCacheMode cacheMode, IgniteTxConcurrency txConcurrency, + private void checkTx(CacheMode cacheMode, IgniteTxConcurrency txConcurrency, IgniteTxIsolation txIsolation) throws Exception { initialize(cacheMode, TRANSACTIONAL, txConcurrency, txIsolation); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index ef48d91..c89ff6b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; 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.GridCachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.IgniteTxIsolation.REPEATABLE_READ; @@ -77,7 +77,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom ccfg.setDistributionMode(partitionDistributionMode()); ccfg.setPreloadMode(SYNC); - if (cacheMode() == GridCacheMode.PARTITIONED) + if (cacheMode() == CacheMode.PARTITIONED) ccfg.setBackups(1); return ccfg; @@ -86,7 +86,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom /** * @return Cache mode. */ - protected abstract GridCacheMode cacheMode(); + protected abstract CacheMode cacheMode(); /** * @return Partition distribution mode for PARTITIONED cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index af95dac..476b465 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -268,7 +268,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri } /** {@inheritDoc} */ - @Override protected abstract GridCacheMode cacheMode(); + @Override protected abstract CacheMode cacheMode(); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() 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/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index dc00bbf..4d8fee4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -455,7 +455,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest } /** {@inheritDoc} */ - @Override protected abstract GridCacheMode cacheMode(); + @Override protected abstract CacheMode cacheMode(); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() 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/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java index 08ed107..279cfd6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.spi.swapspace.file.*; -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.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index 7f5d771..963292d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java @@ -32,8 +32,8 @@ import javax.cache.configuration.*; 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.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; 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/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java index afc34ef..d1ec90b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicExpiredEntriesPreloadSelfTest.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -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.GridCacheDistributionMode.*; /** @@ -29,12 +29,12 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheAtomicExpiredEntriesPreloadSelfTest extends GridCacheExpiredEntriesPreloadAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@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/distributed/dht/GridCacheAtomicFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java index 2b90f9c..cc47636 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; -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.*; /** @@ -34,12 +34,12 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS /** * @return Write order mode for atomic cache. */ - protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() { + protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { return CLOCK; } /** {@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/distributed/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index e74b816..6bceecf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@ -33,10 +33,10 @@ import javax.cache.processor.*; import java.io.*; import java.util.*; -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.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.GridNodeAttributes.*; @@ -61,7 +61,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { private int backups; /** */ - private GridCacheAtomicWriteOrderMode writeOrderMode; + private CacheAtomicWriteOrderMode writeOrderMode; /** */ private int lastKey; @@ -97,7 +97,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNoBackupsPrimaryWriteOrder() throws Exception { - startGrids(0, GridCacheAtomicWriteOrderMode.PRIMARY); + startGrids(0, CacheAtomicWriteOrderMode.PRIMARY); checkNearCache(); } @@ -115,7 +115,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testWithBackupsPrimaryWriteOrder() throws Exception { - startGrids(2, GridCacheAtomicWriteOrderMode.PRIMARY); + startGrids(2, CacheAtomicWriteOrderMode.PRIMARY); checkNearCache(); } @@ -781,7 +781,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { * @param writeOrderMode Write order mode. * @throws Exception If failed. */ - private void startGrids(int backups, GridCacheAtomicWriteOrderMode writeOrderMode) throws Exception { + private void startGrids(int backups, CacheAtomicWriteOrderMode writeOrderMode) throws Exception { this.backups = backups; this.writeOrderMode = writeOrderMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java index 9a2022f..e8d3a7f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; /** * Test for atomic cache with primary write order mode. */ public class GridCacheAtomicPrimaryWriteOrderFullApiSelfTest extends GridCacheAtomicFullApiSelfTest { /** {@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/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java index 1c4b338..4731f37 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; /** * Tests reloadAll for colocated cache with primary write order. */ public class GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest extends GridCacheAtomicReloadAllSelfTest { /** {@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/distributed/dht/GridCacheAtomicReloadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicReloadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicReloadAllSelfTest.java index a0e0f17..fb3c898 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicReloadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicReloadAllSelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Tests reloadAll for colocated cache. */ public class GridCacheAtomicReloadAllSelfTest extends GridCachePartitionedReloadAllAbstractSelfTest { /** {@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/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index d0f4545..cb12d5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -38,7 +38,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.GridCacheDistributionMode.*; 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/distributed/dht/GridCacheColocatedFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java index d28f495..951da6e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; 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.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheColocatedFailoverSelfTest extends GridCacheAbstractFailoverSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index 24fdbb4..e15e8c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -28,8 +28,8 @@ import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; -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.GridCacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java index 768f506..112cb47 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxExceptionSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; 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.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheColocatedTxExceptionSelfTest extends IgniteTxExceptionAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java index d6945ab..aed57fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** @@ -38,7 +38,7 @@ public class GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest exten } /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java index b85aeb9..15fb8b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java @@ -25,8 +25,8 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import 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/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDaemonNodePartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDaemonNodePartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDaemonNodePartitionedSelfTest.java index 25cd49c..5cfcd63 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDaemonNodePartitionedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDaemonNodePartitionedSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.cache.*; */ public class GridCacheDaemonNodePartitionedSelfTest extends GridCacheDaemonNodeAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return GridCacheMode.PARTITIONED; + @Override protected CacheMode cacheMode() { + return CacheMode.PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicEvictionNearReadersSelfTest.java index b8a0d98..2d6be57 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicEvictionNearReadersSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; /** * Test for atomic cache. */ public class GridCacheDhtAtomicEvictionNearReadersSelfTest extends GridCacheDhtEvictionNearReadersSelfTest { /** {@inheritDoc} */ - @Override public GridCacheAtomicityMode atomicityMode() { + @Override public 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/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java index 985de6c..50589fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; 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.GridCacheMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** @@ -29,12 +29,12 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheDhtAtomicRemoveFailureTest extends GridCacheAbstractRemoveFailureTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; } /** {@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/distributed/dht/GridCacheDhtEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java index d747b42..32ca52b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java @@ -35,8 +35,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.GridCacheDistributionMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java index 8b77230..ecb466a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; 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.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.GridCacheDistributionMode.*; */ public class GridCacheDhtEntrySetSelfTest extends GridCacheEntrySetAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { + @Override protected CacheMode cacheMode() { return PARTITIONED; }
