http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index 5a4fb1f..23979f1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -36,8 +36,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; 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.*; /** * Test for group locking. @@ -130,7 +130,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGroupLockPutOneKey(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupLockPutOneKey(IgniteTxConcurrency concurrency) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -197,7 +197,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGroupLockRemoveOneKey(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupLockRemoveOneKey(IgniteTxConcurrency concurrency) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -277,7 +277,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGroupLockGetOneKey(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupLockGetOneKey(IgniteTxConcurrency concurrency) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -340,7 +340,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr } /** @throws IgniteCheckedException */ - private void checkGroupLockWithExternalLock(final GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupLockWithExternalLock(final IgniteTxConcurrency concurrency) throws Exception { assert sanityCheckEnabled(); final UUID affinityKey = primaryKeyForCache(grid(0)); @@ -425,7 +425,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkSanityCheckDisabled(final GridCacheTxConcurrency concurrency) throws Exception { + private void checkSanityCheckDisabled(final IgniteTxConcurrency concurrency) throws Exception { assert !sanityCheckEnabled(); final UUID affinityKey = primaryKeyForCache(grid(0)); @@ -486,7 +486,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGroupPartitionLock(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupPartitionLock(IgniteTxConcurrency concurrency) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -610,7 +610,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGetPut(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { + private void checkGetPut(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -669,7 +669,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGetPutEmptyCache(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { + private void checkGetPutEmptyCache(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -750,7 +750,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGetRemove(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { + private void checkGetRemove(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -830,7 +830,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGetAfterPut(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGetAfterPut(IgniteTxConcurrency concurrency) throws Exception { CollectingEventListener locks = new CollectingEventListener(); CollectingEventListener unlocks = new CollectingEventListener(); @@ -911,7 +911,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGetRepeatableRead(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGetRepeatableRead(IgniteTxConcurrency concurrency) throws Exception { UUID key = primaryKeyForCache(grid(0)); cache(0).put(key, "val"); @@ -939,7 +939,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGroupLockPutWrongKey(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupLockPutWrongKey(IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); final GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); @@ -974,7 +974,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGroupLockRemoveWrongKey(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupLockRemoveWrongKey(IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); final GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); @@ -1029,7 +1029,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr * @param isolation Isolation. * @throws Exception If failed. */ - private void checkGroupLockReadAffinityKey(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) + private void checkGroupLockReadAffinityKey(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); @@ -1080,7 +1080,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr /** * @throws Exception If failed. */ - private void checkGroupLockWriteThrough(GridCacheTxConcurrency concurrency) throws Exception { + private void checkGroupLockWriteThrough(IgniteTxConcurrency concurrency) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); GridCache<GridCacheAffinityKey<String>, 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/GridCacheGroupLockPutTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java index d6f6e47..8669b06 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.*; 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.*; /** * Puts all the passed data into partitioned cache in small chunks. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index c97379a..73d59ab 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; 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.IgniteTxConcurrency.*; /** * Tests {@link GridCacheInterceptor}. @@ -815,8 +815,8 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst return; if (atomicityMode() == TRANSACTIONAL) { - for (GridCacheTxConcurrency txConcurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation txIsolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency txConcurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation txIsolation : IgniteTxIsolation.values()) { for (Operation op : Operation.values()) { // TODO: GG-8118 enable when fixed. if (op == Operation.UPDATE_FILTER && txConcurrency == OPTIMISTIC) @@ -839,8 +839,8 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst * @param op Operation type. * @throws Exception If failed. */ - private void testNearNodeKey(@Nullable GridCacheTxConcurrency txConcurrency, - @Nullable GridCacheTxIsolation txIsolation, @Nullable Operation op) throws Exception { + private void testNearNodeKey(@Nullable IgniteTxConcurrency txConcurrency, + @Nullable IgniteTxIsolation txIsolation, @Nullable Operation op) throws Exception { // Interceptor returns incremented new value. interceptor.retInterceptor = new InterceptorAdapter() { @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java index 03b400e..855109e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java @@ -19,8 +19,8 @@ import org.gridgain.testframework.junits.common.*; import java.io.*; 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.*; /** * Test transaction with wrong marshalling. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java index b1217a6..7fe5d54 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java @@ -24,8 +24,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.*; /** * Test case checks partition exchange when non-cache node joins topology (partition http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index 152602e..71fda30 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -29,8 +29,8 @@ import java.util.concurrent.atomic.*; 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.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java index 7d9be00..d0d24e5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -23,8 +23,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -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.*; /** * Nested transaction emulation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java index 3a60003..88b9288 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -27,8 +27,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.*; /** * Tests that common cache objects' toString() methods do not lead to stack overflow. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java index 1a9b121..f84e9c7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java @@ -15,8 +15,8 @@ import org.gridgain.testframework.*; import java.util.concurrent.*; -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 update test with off heap enabled. @@ -47,7 +47,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void testTransformTx(final Integer key, final GridCacheTxConcurrency txConcurrency) throws Exception { + private void testTransformTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -111,7 +111,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void testPutTx(final Integer key, final GridCacheTxConcurrency txConcurrency) throws Exception { + private void testPutTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -167,7 +167,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void testPutWithFilterTx(final Integer key, final GridCacheTxConcurrency txConcurrency) throws Exception { + private void testPutWithFilterTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); @@ -223,7 +223,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void testPutxIfAbsentTx(final Integer key, final GridCacheTxConcurrency txConcurrency) throws Exception { + private void testPutxIfAbsentTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { final GridCache<Integer, Integer> cache = grid(0).cache(null); cache.put(key, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index 7ae9e9d..4456346 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -25,8 +25,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; 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.*; /** * @@ -223,7 +223,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutGetRemoveTx(Integer key, GridCacheTxConcurrency txConcurrency) throws Exception { + private void checkPutGetRemoveTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { GridCache<Integer, Integer> c = grid(0).cache(null); IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); @@ -248,7 +248,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutGetRemoveTxByteArray(Integer key, GridCacheTxConcurrency txConcurrency) throws Exception { + private void checkPutGetRemoveTxByteArray(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { GridCache<Integer, byte[]> c = grid(0).cache(null); IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); @@ -358,7 +358,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutAllGetAllRemoveAllTx(GridCacheTxConcurrency txConcurrency) throws Exception { + private void checkPutAllGetAllRemoveAllTx(IgniteTxConcurrency txConcurrency) throws Exception { Map<Integer, Integer> map = new HashMap<>(); for (int i = 0; i < 100; i++) @@ -453,7 +453,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutGetRemoveObjectTx(Integer key, GridCacheTxConcurrency txConcurrency) throws Exception { + private void checkPutGetRemoveObjectTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { GridCache<Integer, TestValue> c = grid(0).cache(null); TestValue val = new TestValue(new byte[10]); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java index 7adacd7..34c01e2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java @@ -16,8 +16,8 @@ import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.testframework.junits.common.*; -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.*; /** * Check for specific support issue. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index 90ca487..cc056ac 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -12,8 +12,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -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.*; /** * Transactional cache metrics test. @@ -196,7 +196,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid * @param put Put some data if {@code true}. * @throws Exception If failed. */ - private void testCommits(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, boolean put) + private void testCommits(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { GridCache<Integer, Integer> cache = grid(0).cache(null); @@ -236,7 +236,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid * @param put Put some data if {@code true}. * @throws Exception If failed. */ - private void testRollbacks(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, + private void testRollbacks(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) throws Exception { GridCache<Integer, Integer> 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/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index e8b7b14..484c793 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.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.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.*; /** * Basic store test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index 675bf73..782f0a0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -23,8 +23,8 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; 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.*; /** * Tests write-behind store with near and dht commit option. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java index 58c3333..c6a9c09 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java @@ -26,8 +26,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -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.*; /** * Tests for local transactions. @@ -156,7 +156,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws Exception If check failed. */ - protected void checkCommit(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { + protected void checkCommit(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { int gridIdx = RAND.nextInt(gridCount()); Ignite ignite = grid(gridIdx); @@ -281,7 +281,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws IgniteCheckedException If check failed. */ - protected void checkRollback(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) + protected void checkRollback(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { checkRollback(new ConcurrentHashMap<Integer, String>(), concurrency, isolation); } @@ -292,8 +292,8 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws IgniteCheckedException If check failed. */ - protected void checkRollback(ConcurrentMap<Integer, String> map, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation) throws Exception { + protected void checkRollback(ConcurrentMap<Integer, String> map, IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation) throws Exception { int gridIdx = RAND.nextInt(gridCount()); Ignite ignite = grid(gridIdx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java index 9548cd0..9e602e6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java @@ -23,8 +23,8 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; -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.*; /** * Checks multithreaded put/get cache operations on one node. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 7b39975..506a552 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -191,8 +191,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutNearTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); @@ -204,8 +204,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutPrimaryTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); @@ -217,8 +217,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutBackupTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); @@ -230,8 +230,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutMultipleKeysTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY), keyForNode(grid(0).localNode(), PRIMARY), @@ -264,8 +264,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @param isolation Transaction isolation. * @throws Exception If failed. */ - private void checkPutTx(boolean putBefore, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation, final Integer... keys) throws Exception { + private void checkPutTx(boolean putBefore, IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation, final Integer... keys) throws Exception { assertTrue(keys.length > 0); info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 4822742..50dbcbd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -34,8 +34,8 @@ import java.util.*; import java.util.concurrent.atomic.*; 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/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index efb7a26..421f307 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -18,8 +18,8 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -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.*; /** * Tests for local transactions. @@ -36,8 +36,8 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract * @param isolation Isolation. * @throws Exception If check failed. */ - protected void checkCommitMultithreaded(final GridCacheTxConcurrency concurrency, - final GridCacheTxIsolation isolation) throws Exception { + protected void checkCommitMultithreaded(final IgniteTxConcurrency concurrency, + final IgniteTxIsolation isolation) throws Exception { GridTestUtils.runMultiThreaded(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Thread t = Thread.currentThread(); @@ -63,8 +63,8 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract * @param isolation Isolation. * @throws Exception If check failed. */ - protected void checkRollbackMultithreaded(final GridCacheTxConcurrency concurrency, - final GridCacheTxIsolation isolation) throws Exception { + protected void checkRollbackMultithreaded(final IgniteTxConcurrency concurrency, + final IgniteTxIsolation isolation) throws Exception { final ConcurrentMap<Integer, String> map = new ConcurrentHashMap<>(); GridTestUtils.runMultiThreaded(new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java index 8decc56..06c17e8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java @@ -29,8 +29,8 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; 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.*; /** * Tests reentry in pessimistic repeatable read tx. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxSingleThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxSingleThreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxSingleThreadedAbstractTest.java index 017bc16..4ed449c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxSingleThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxSingleThreadedAbstractTest.java @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; -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.*; /** * Tests for local transactions. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index f79aea0..443ef33 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -190,8 +190,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutNearTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); @@ -203,8 +203,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutPrimaryTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); @@ -216,8 +216,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutBackupTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); @@ -229,8 +229,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutMultipleKeysTx() throws Exception { - for (GridCacheTxConcurrency concurrency : GridCacheTxConcurrency.values()) { - for (GridCacheTxIsolation isolation : GridCacheTxIsolation.values()) { + for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY), keyForNode(grid(0).localNode(), PRIMARY), @@ -263,8 +263,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @param isolation Transaction isolation. * @throws Exception If failed. */ - private void checkPutTx(boolean putBefore, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation, final Integer... keys) throws Exception { + private void checkPutTx(boolean putBefore, IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation, final Integer... keys) throws Exception { assertTrue(keys.length > 0); info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java index db7115b..87abc1a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java @@ -24,8 +24,8 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -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.*; /** * Cache sequence basic tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java index 5ed6edd..e224300 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java @@ -25,8 +25,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.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 84340a9..c86ec66 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -28,8 +28,8 @@ import static java.util.concurrent.TimeUnit.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; 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/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index 24a33bb..ed7c40a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -19,8 +19,8 @@ import org.jetbrains.annotations.*; 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.*; import static org.junit.Assert.*; /** @@ -309,7 +309,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val Value. * @throws Exception If failed. */ - private void testTransaction0(GridCache<Integer, Object>[] caches, GridCacheTxConcurrency concurrency, + private void testTransaction0(GridCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed0(caches, concurrency, key, val, null, null); } @@ -325,7 +325,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed0(GridCache<Integer, Object>[] caches, GridCacheTxConcurrency concurrency, + private void testTransactionMixed0(GridCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { for (GridCache<Integer, Object> cache : caches) { 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/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index 5773714..b5a59f9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -26,8 +26,8 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheFlag.*; -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.*; /** * Tests cache access from within jobs. @@ -103,7 +103,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra * @param jobCnt Job count. * @throws Exception If fails. */ - private void checkTransactions(final GridCacheTxConcurrency concur, final GridCacheTxIsolation isolation, + private void checkTransactions(final IgniteTxConcurrency concur, final IgniteTxIsolation isolation, final int jobCnt) throws Exception { info("Grid 0: " + grid(0).localNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 372639f..f8d1574 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheConfiguration.*; 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 node restart. @@ -211,7 +211,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs /** * @return Transaction concurrency to use in tests. */ - protected GridCacheTxConcurrency txConcurrency() { + protected IgniteTxConcurrency txConcurrency() { return PESSIMISTIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index 1c8bf17..0152c9f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -20,8 +20,8 @@ import org.gridgain.testframework.junits.common.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; 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/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index a05eacc..f272c87 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -24,8 +24,8 @@ import org.gridgain.testframework.junits.common.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -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/GridCacheEntrySetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java index a89ced2..90ae42e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java @@ -19,8 +19,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -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/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java index 6801ffc..9f29f87 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -27,8 +27,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.events.IgniteEventType.*; -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.*; /** * Tests events. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 4238c15..dab4588 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -26,8 +26,8 @@ import java.util.*; import static org.apache.ignite.IgniteState.*; 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.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -148,7 +148,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac * @param isolation Isolation. * @throws Exception If check failed. */ - private void checkTransaction(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Throwable { + private void checkTransaction(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Throwable { int idx = RAND.nextInt(GRID_CNT); info("Grid will be stopped: " + 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/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index ecdbe00..5c7ba54 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -27,8 +27,8 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; 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.*; import static org.apache.ignite.events.IgniteEventType.*; @@ -80,10 +80,10 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { private GridCacheAtomicityMode atomicityMode; /** TX concurrency. */ - private GridCacheTxConcurrency txConcurrency; + private IgniteTxConcurrency txConcurrency; /** TX isolation. */ - private GridCacheTxIsolation txIsolation; + private IgniteTxIsolation txIsolation; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -145,7 +145,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("unchecked") private void initialize(GridCacheMode cacheMode, GridCacheAtomicityMode atomicityMode, - GridCacheTxConcurrency txConcurrency, GridCacheTxIsolation txIsolation) throws Exception { + IgniteTxConcurrency txConcurrency, IgniteTxIsolation txIsolation) throws Exception { this.cacheMode = cacheMode; this.atomicityMode = atomicityMode; this.txConcurrency = txConcurrency; @@ -443,8 +443,8 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ - private void checkTx(GridCacheMode cacheMode, GridCacheTxConcurrency txConcurrency, - GridCacheTxIsolation txIsolation) throws Exception { + private void checkTx(GridCacheMode cacheMode, IgniteTxConcurrency txConcurrency, + IgniteTxIsolation txIsolation) throws Exception { initialize(cacheMode, TRANSACTIONAL, txConcurrency, txIsolation); System.out.println("BEFORE: " + evts.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index f2b1640..153ff55 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -24,8 +24,8 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; -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; 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/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 9f08861..d7da1ab 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -28,7 +28,7 @@ import org.gridgain.testframework.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; /** * Abstract test for originating node failure. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index 0d28928..1b898fc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -30,7 +30,7 @@ import org.gridgain.testframework.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; /** * Abstract test for originating node failure. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 0483a26..2227e56 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -21,7 +21,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.GridCacheTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; /** * Tests transaction during cache preloading. @@ -129,7 +129,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT * @param txConcurrency Transaction concurrency; * @throws Exception If failed. */ - private void testLocalTxPreloading(GridCacheTxConcurrency txConcurrency) throws Exception { + private void testLocalTxPreloading(IgniteTxConcurrency txConcurrency) throws Exception { Map<String, Integer> map = new HashMap<>(); for (int i = 0; i < 10000; i++) @@ -150,7 +150,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT GridCache<String, Integer> cache = cache(i); - try (IgniteTx tx = cache.txStart(txConcurrency, GridCacheTxIsolation.READ_COMMITTED)) { + try (IgniteTx tx = cache.txStart(txConcurrency, IgniteTxIsolation.READ_COMMITTED)) { cache.transform(TX_KEY, new C1<Integer, Integer>() { @Override public Integer apply(Integer val) { if (val == 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/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index 7a8f65e..7be173d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -16,8 +16,8 @@ import org.gridgain.testframework.junits.common.*; 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.*; /** * Simple cache test. @@ -107,8 +107,8 @@ public class IgniteTxTimeoutAbstractTest 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 { int idx = RAND.nextInt(GRID_COUNT); 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/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index f629304..5635ac8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.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.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.*; /** * Tests write-through. @@ -220,7 +220,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri * @param op Op. * @throws Exception If failed. */ - protected void checkTransform(GridCacheTxConcurrency concurrency, int nodeType, int op) throws Exception { + protected void checkTransform(IgniteTxConcurrency concurrency, int nodeType, int op) throws Exception { GridCacheProjection<String, Integer> cache = cache(0); Collection<String> keys = keysForType(nodeType); 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/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 76bf537..794c487 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -31,8 +31,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.*; /** @@ -438,7 +438,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @param isolation Tx isolation. * @throws Exception If failed. */ - private void checkSinglePut(boolean explicitTx, GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) + private void checkSinglePut(boolean explicitTx, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { startGrid(); @@ -472,7 +472,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @param isolation Tx isolation. * @throws Exception If failed. */ - private void checkReentry(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { + private void checkReentry(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { startGrid(); try { @@ -515,8 +515,8 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("AssertEqualsBetweenInconvertibleTypes") - private void checkDistributedPut(boolean explicitTx, boolean separate, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation) throws Exception { + private void checkDistributedPut(boolean explicitTx, boolean separate, IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation) throws Exception { storeEnabled = false; startGridsMultiThreaded(3); @@ -605,8 +605,8 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("AssertEqualsBetweenInconvertibleTypes") - private void checkNonLocalPuts(boolean explicitTx, boolean separate, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation) throws Exception { + private void checkNonLocalPuts(boolean explicitTx, boolean separate, IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation) throws Exception { storeEnabled = false; startGridsMultiThreaded(3); @@ -778,7 +778,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("AssertEqualsBetweenInconvertibleTypes") - private void checkRollback(boolean separate, GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) + private void checkRollback(boolean separate, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { storeEnabled = false; 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/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index 7855a99..275ede0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -23,8 +23,8 @@ import org.gridgain.testframework.junits.common.*; 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.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.*; /** 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/GridCacheGroupLockPartitionedAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java index bf15118..ade3df0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java @@ -20,8 +20,8 @@ import java.util.*; import java.util.concurrent.*; 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.*; /** * Group lock abstract test for partitioned cache. @@ -63,7 +63,7 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid /** * @throws Exception If failed. */ - private void checkUpdateEntry(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { + private void checkUpdateEntry(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { UUID affinityKey = primaryKeyForCache(grid(0)); GridCache<GridCacheAffinityKey<Integer>, Integer> cache = cache(0);
