http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java index 2f37a2e..f40eecb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest.java @@ -17,8 +17,8 @@ import org.gridgain.grid.util.typedef.*; import java.util.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Multi-node test for group locking. @@ -47,7 +47,7 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext /** * @throws Exception If failed. */ - private void checkNonLocalKey(GridCacheTxConcurrency concurrency) throws Exception { + private void checkNonLocalKey(IgniteTxConcurrency concurrency) throws Exception { final UUID key = primaryKeyForCache(grid(1)); GridCache<Object, Object> cache = grid(0).cache(null); @@ -104,7 +104,7 @@ public abstract class GridCacheGroupLockPartitionedMultiNodeAbstractSelfTest ext /** * @throws Exception If failed. */ - private void checkNearReadersUpdate(boolean touchAffKey, GridCacheTxConcurrency concurrency) throws Exception { + private void checkNearReadersUpdate(boolean touchAffKey, IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); GridCacheAffinityKey<String> key1 = new GridCacheAffinityKey<>("key1", affinityKey);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index bf2bd80..8296f97 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -32,8 +32,8 @@ import java.util.concurrent.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.events.IgniteEventType.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java index 8884116..2f02df0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java @@ -22,8 +22,8 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** @@ -81,7 +81,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - private void checkSimpleTxs(boolean nearEnabled, GridCacheTxConcurrency concurrency) throws Exception { + private void checkSimpleTxs(boolean nearEnabled, IgniteTxConcurrency concurrency) throws Exception { try { this.nearEnabled = nearEnabled; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index dadb2d5..28b8dcc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -26,8 +26,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Test getting the same value twice within the same transaction. @@ -210,7 +210,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { * @param put If {@code true}, then value will be pre-stored in cache. * @throws Exception If failed. */ - private void checkDoubleGet(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, boolean put) + private void checkDoubleGet(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { GridCache<Integer, String> cache = grid(0).cache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index d58da7a..f320a34 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -35,8 +35,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCachePeekMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Multi node test for near cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java index 467c71f..335c47a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java @@ -25,8 +25,8 @@ import java.util.concurrent.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Single node test for near cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java index b92f17c..77e6e44 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java @@ -26,8 +26,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Near-only cache node startup test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java index 834c145..e3aadeae 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java @@ -30,8 +30,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** @@ -187,7 +187,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { * @param isolation Transaction isolation. * @throws Exception If failed. */ - private void testReadersUpdate(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { + private void testReadersUpdate(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { GridCache<Integer, Integer> cache = grid(0).cache(null); try (IgniteTx tx = cache.txStart(concurrency, isolation)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java index 7a553d2..d0657f1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java @@ -25,8 +25,8 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java index 6d3a51d..2f72666 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** @@ -146,7 +146,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT * @param concurrency Tx concurrency. * @param isolation Tx isolation. */ - private void doTestEviction(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) + private void doTestEviction(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { assert concurrency != null; assert isolation != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 8274803..54b103d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -35,8 +35,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Multiple put test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index a088915..34ed97a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Multithreaded partition cache put get test. @@ -160,7 +160,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings({"TooBroadScope", "PointlessBooleanExpression"}) - private void doTest(final GridCacheTxConcurrency concurrency, final GridCacheTxIsolation isolation) + private void doTest(final IgniteTxConcurrency concurrency, final IgniteTxIsolation isolation) throws Exception { final AtomicInteger cntr = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java index 129156a..7ab2f90 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java @@ -16,7 +16,7 @@ import org.gridgain.grid.kernal.processors.cache.distributed.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java index 730c4bc..52dd3b3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java @@ -16,7 +16,7 @@ import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** @@ -46,7 +46,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb } /** {@inheritDoc} */ - @Override protected GridCacheTxConcurrency txConcurrency() { + @Override protected IgniteTxConcurrency txConcurrency() { return OPTIMISTIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index 1370fc3..74374fb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -38,8 +38,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setDefaultTxConcurrency(GridCacheTxConcurrency.OPTIMISTIC); - c.getTransactionsConfiguration().setDefaultTxIsolation(GridCacheTxIsolation.READ_COMMITTED); + c.getTransactionsConfiguration().setDefaultTxConcurrency(IgniteTxConcurrency.OPTIMISTIC); + c.getTransactionsConfiguration().setDefaultTxIsolation(IgniteTxIsolation.READ_COMMITTED); GridCacheConfiguration cc1 = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index 215e846..0b56ca5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -26,8 +26,8 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Test tx salvage. @@ -136,7 +136,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * (i.e. call {@link GridCacheTxEx#prepare()}). * @throws Exception If failed. */ - private void checkSalvageAfterTimeout(GridCacheTxConcurrency mode, boolean prepare) throws Exception { + private void checkSalvageAfterTimeout(IgniteTxConcurrency mode, boolean prepare) throws Exception { startTxAndPutKeys(mode, prepare); stopNodeAndSleep(SALVAGE_TIMEOUT + DELTA_AFTER); @@ -155,7 +155,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * (i.e. call {@link GridCacheTxEx#prepare()}). * @throws Exception If failed. */ - private void checkSalvageBeforeTimeout(GridCacheTxConcurrency mode, boolean prepare) throws Exception { + private void checkSalvageBeforeTimeout(IgniteTxConcurrency mode, boolean prepare) throws Exception { startTxAndPutKeys(mode, prepare); List<Integer> nearSizes = new ArrayList<>(GRID_CNT - 1); @@ -182,7 +182,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * (i.e. call {@link GridCacheTxEx#prepare()}). * @throws Exception If failed. */ - private void startTxAndPutKeys(final GridCacheTxConcurrency mode, final boolean prepare) throws Exception { + private void startTxAndPutKeys(final IgniteTxConcurrency mode, final boolean prepare) throws Exception { Ignite ignite = grid(0); final Collection<Integer> keys = nearKeys(ignite); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java index f4febde..5e9a70b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java @@ -28,8 +28,8 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** @@ -140,8 +140,8 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes * @param isolation Isolation. * @throws Throwable If check failed. */ - private void checkCommit(GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation) throws Throwable { + private void checkCommit(IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation) throws Throwable { int idx = RAND.nextInt(GRID_CNT); GridCache<Integer, String> cache = cache(idx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index b9434d4..ca20076 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -23,8 +23,8 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index ea6625f..a5ce8c1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -28,8 +28,8 @@ import java.util.concurrent.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index e2dbcd4..252b542 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 2984d7c..e6146f7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -27,8 +27,8 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +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/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index df8a76f..7f9d871 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -45,10 +45,10 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb private GridCacheStore<String, String> testStore; /** Tx concurrency to use. */ - private GridCacheTxConcurrency txConcurrency; + private IgniteTxConcurrency txConcurrency; /** Tx isolation to use. */ - private GridCacheTxIsolation txIsolation; + private IgniteTxIsolation txIsolation; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -147,10 +147,10 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb * @throws Exception If failed. */ private void checkPolicy0() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { txConcurrency = concurrency; - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { txIsolation = isolation; Ignite g = startGrids(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index 423f35e..1c3102b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -28,8 +28,8 @@ import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index 09f8c22..a6a5ee7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -27,8 +27,8 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index f00beaa..0409d24 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -24,8 +24,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMemoryMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Byte values test for LOCAL cache. @@ -200,7 +200,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val Value. * @throws Exception If failed. */ - private void testTransaction(GridCache<Integer, Object> cache, GridCacheTxConcurrency concurrency, + private void testTransaction(GridCache<Integer, Object> cache, IgniteTxConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed(cache, concurrency, key, val, null, null); } @@ -216,7 +216,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed(GridCache<Integer, Object> cache, GridCacheTxConcurrency concurrency, + private void testTransactionMixed(GridCache<Integer, Object> cache, IgniteTxConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { IgniteTx tx = cache.txStart(concurrency, REPEATABLE_READ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index fa5188c..b8b5f17 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -18,8 +18,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.testframework.junits.common.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * @@ -116,8 +116,8 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws IgniteCheckedException If test failed. */ - private void checkTransactionTimeout(GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation) throws Exception { + private void checkTransactionTimeout(IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation) throws Exception { boolean wasEx = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java index e6e54f6..a9573da 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java @@ -36,8 +36,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsFileInfo.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java index 846fcbc..f5020fb 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java @@ -51,10 +51,10 @@ abstract class GridCacheAbstractLoadTest { protected final int operationsPerTx; /** Transaction isolation level. */ - protected final GridCacheTxIsolation isolation; + protected final IgniteTxIsolation isolation; /** Transaction concurrency control. */ - protected final GridCacheTxConcurrency concurrency; + protected final IgniteTxConcurrency concurrency; /** Threads count. */ protected final int threads; @@ -103,8 +103,8 @@ abstract class GridCacheAbstractLoadTest { tx = Boolean.valueOf(props.getProperty("transactions")); operationsPerTx = Integer.valueOf(props.getProperty("operations.per.tx")); - isolation = GridCacheTxIsolation.valueOf(props.getProperty("isolation")); - concurrency = GridCacheTxConcurrency.valueOf(props.getProperty("concurrency")); + isolation = IgniteTxIsolation.valueOf(props.getProperty("isolation")); + concurrency = IgniteTxConcurrency.valueOf(props.getProperty("concurrency")); threads = Integer.valueOf(props.getProperty("threads")); writeRatio = Double.valueOf(props.getProperty("write.ratio")); testDuration = Long.valueOf(props.getProperty("duration")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java index fbfe371..dbc8e31 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java @@ -24,8 +24,8 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMemoryMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java index 6382f46..c87fcbd 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java @@ -21,8 +21,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.PESSIMISTIC; -import static org.apache.ignite.transactions.GridCacheTxIsolation.REPEATABLE_READ; +import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.IgniteTxIsolation.REPEATABLE_READ; /** * Performance comparison between putAll and group lock. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index 8777061..12a5782 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -24,8 +24,8 @@ import org.gridgain.testframework.junits.common.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.PESSIMISTIC; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java index 78f678c..4d283a4 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java @@ -428,12 +428,12 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob } /** {@inheritDoc} */ - @Nullable @Override public GridCacheTxIsolation isolation() { + @Nullable @Override public IgniteTxIsolation isolation() { return null; } /** {@inheritDoc} */ - @Nullable @Override public GridCacheTxConcurrency concurrency() { + @Nullable @Override public IgniteTxConcurrency concurrency() { return null; } @@ -448,7 +448,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob } /** {@inheritDoc} */ - @Nullable @Override public GridCacheTxState state() { + @Nullable @Override public IgniteTxState state() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java index 2a764d0..56809c3 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java @@ -18,8 +18,8 @@ import org.hibernate.cache.spi.access.*; import java.util.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** * Implementation of {@link AccessType#READ_WRITE} cache access strategy. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 0865168..a0db474 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -53,8 +53,8 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac TransactionsConfiguration tCfg = new TransactionsConfiguration(); - tCfg.setDefaultTxConcurrency(GridCacheTxConcurrency.PESSIMISTIC); - tCfg.setDefaultTxIsolation(GridCacheTxIsolation.REPEATABLE_READ); + tCfg.setDefaultTxConcurrency(IgniteTxConcurrency.PESSIMISTIC); + tCfg.setDefaultTxIsolation(IgniteTxIsolation.REPEATABLE_READ); cfg.setTransactionsConfiguration(tCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java index 046b6b0..58c9ce3 100644 --- a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java +++ b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java @@ -17,7 +17,7 @@ import org.gridgain.grid.util.typedef.internal.*; import javax.transaction.xa.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.GridCacheTxState.*; +import static org.apache.ignite.transactions.IgniteTxState.*; /** * Cache XA resource implementation. @@ -227,7 +227,7 @@ public final class GridCacheXAResource implements XAResource { * @return {@code true} if jta was already committed or rolled back. */ public boolean isFinished() { - GridCacheTxState state = cacheTx.state(); + IgniteTxState state = cacheTx.state(); return state == COMMITTED || state == ROLLED_BACK; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java index 91805b9..a7080ec 100644 --- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java @@ -19,7 +19,7 @@ import org.objectweb.jotm.*; import javax.transaction.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxState.*; +import static org.apache.ignite.transactions.IgniteTxState.*; /** * Abstract class for cache tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java index 8cf66a9..8697366 100644 --- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java +++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java @@ -24,8 +24,8 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; -import static org.apache.ignite.transactions.GridCacheTxIsolation.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /**
