http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java index 7caf95d..e0953d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java @@ -33,8 +33,8 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Test with variable number of nodes. @@ -161,7 +161,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); - try (IgniteTx tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer val = (Integer) grid(i).jcache(null).get(key); assertEquals("Simple check failed for node: " + i, (Integer) i, val); @@ -186,7 +186,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac assert PARTITIONED == grid(i).jcache(null).getConfiguration(CacheConfiguration.class).getCacheMode(); - try (IgniteTx tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(i).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { GridCacheInternalKey key = new GridCacheInternalKeyImpl(name); GridCacheAtomicLongValue atomicVal = ((GridCacheAtomicLongValue) grid(i).jcache(null).get(key)); @@ -244,7 +244,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac // Init cache data. - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // Put simple value. grid(0).jcache(null).put(key, INIT_GRID_NUM); @@ -267,7 +267,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac // Init cache data. - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // Put custom data grid(0).jcache(null).put(new GridCacheInternalKeyImpl(key), new GridCacheAtomicLongValue(INIT_GRID_NUM));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 8d6b80f..c0f4200 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -33,8 +33,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * @@ -173,7 +173,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl info("Partition: " + ignite.affinity(null).partition(1)); - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // info("Getting value for key 1"); String s = cache.get(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index eae37e9..196a892 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -27,8 +27,8 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; import static org.junit.Assert.*; /** @@ -313,7 +313,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val Value. * @throws Exception If failed. */ - private void testTransaction0(IgniteCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, + private void testTransaction0(IgniteCache<Integer, Object>[] caches, TransactionConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed0(caches, concurrency, key, val, null, null); } @@ -329,10 +329,10 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed0(IgniteCache<Integer, Object>[] caches, IgniteTxConcurrency concurrency, + private void testTransactionMixed0(IgniteCache<Integer, Object>[] caches, TransactionConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { for (IgniteCache<Integer, Object> cache : caches) { - IgniteTx tx = cache.unwrap(Ignite.class).transactions().txStart(concurrency, REPEATABLE_READ); + Transaction tx = cache.unwrap(Ignite.class).transactions().txStart(concurrency, REPEATABLE_READ); try { cache.put(key1, val1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index b0a145d..80fed2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; @@ -37,8 +36,8 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.internal.processors.cache.CacheFlag.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests cache access from within jobs. @@ -114,7 +113,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra * @param jobCnt Job count. * @throws Exception If fails. */ - private void checkTransactions(final IgniteTxConcurrency concur, final IgniteTxIsolation isolation, + private void checkTransactions(final TransactionConcurrency concur, final TransactionIsolation isolation, final int jobCnt) throws Exception { info("Grid 0: " + grid(0).localNode().id()); @@ -136,7 +135,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra @Override public Void applyx(final Integer i) throws IgniteCheckedException { GridCache<String, int[]> cache = ((IgniteKernal)this.ignite).cache(null); - try (IgniteTx tx = cache.txStart(concur, isolation)) { + try (Transaction tx = cache.txStart(concur, isolation)) { int[] arr = cache.get("TestKey"); if (arr == null) @@ -179,7 +178,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra // Do within transaction to make sure that lock is acquired // which means that all previous transactions have committed. - try (IgniteTx tx = grid(i).transactions().txStart(concur, isolation)) { + try (Transaction tx = grid(i).transactions().txStart(concur, isolation)) { int[] arr = c.get("TestKey"); assertNotNull(arr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 461f657..61d7f0d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -34,8 +34,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.configuration.CacheConfiguration.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Test node restart. @@ -220,7 +220,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs /** * @return Transaction concurrency to use in tests. */ - protected IgniteTxConcurrency txConcurrency() { + protected TransactionConcurrency txConcurrency() { return PESSIMISTIC; } @@ -504,7 +504,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs try { cache.put(key, Integer.toString(key)); } - catch (IgniteTxRollbackException | ClusterTopologyException |CacheException ignored) { + catch (TransactionRollbackException | ClusterTopologyException |CacheException ignored) { // It is ok if primary node leaves grid. } @@ -632,7 +632,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs int c = 0; try { - try (IgniteTx tx = ignite.transactions().txStart(txConcurrency(), REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(txConcurrency(), REPEATABLE_READ)) { c = txCntr.incrementAndGet(); if (c % logFreq == 0) @@ -789,7 +789,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs int c = 0; - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { c = txCntr.incrementAndGet(); if (c % logFreq == 0) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index f7c696d..334147b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -30,8 +30,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Test ensuring that PRIMARY_SYNC mode works correctly. @@ -93,7 +93,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs IgniteCache<Integer, Integer> cache = grid(j).jcache(null); if (grid(j).affinity(null).isPrimary(grid(j).localNode(), i)) { - try (IgniteTx tx = grid(j).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(j).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { cache.put(i, i); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index 9cf67de..123e2b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.util.typedef.*; @@ -35,8 +34,8 @@ import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Simple cache test. @@ -284,7 +283,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite3.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); - IgniteTx tx = ignite1.transactions().txStart(OPTIMISTIC, READ_COMMITTED, 0, 0); + Transaction tx = ignite1.transactions().txStart(OPTIMISTIC, READ_COMMITTED, 0, 0); try { cache1.put("tx1", "val1"); @@ -351,7 +350,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes cache1.put("key", "val"); - IgniteTx tx = ignite1.transactions().txStart(); + Transaction tx = ignite1.transactions().txStart(); long ttl = 500; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java index 31e6cd6..ebb9b40 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java @@ -24,14 +24,13 @@ import org.apache.ignite.testframework.*; import org.apache.ignite.transactions.*; import javax.cache.*; -import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * @@ -92,7 +91,7 @@ public abstract class GridCacheEntrySetAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ private void putAndCheckEntrySet(IgniteCache<Object, Object> cache) throws Exception { - try (IgniteTx tx = cache.unwrap(Ignite.class).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = cache.unwrap(Ignite.class).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer total = (Integer) cache.get(TX_KEY); if (total == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java index 1886a86..def2f09 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -37,8 +37,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests events. @@ -241,7 +241,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - IgniteTx tx = cache.txStart(); + Transaction tx = cache.txStart(); assert cache.put(key, val) == null; @@ -273,7 +273,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - IgniteTx tx = cache.txStart(); + Transaction tx = cache.txStart(); assert cache.put(key, val) == null; @@ -339,7 +339,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - IgniteTx tx = cache.txStart(); + Transaction tx = cache.txStart(); assert cache.putAsync(key, val).get() == null; @@ -371,7 +371,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - IgniteTx tx = cache.txStart(); + Transaction tx = cache.txStart(); assert cache.putAsync(key, val).get() == null; @@ -431,7 +431,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - IgniteTx tx = cache.txStart(); + Transaction tx = cache.txStart(); assert cache.putx(key, val); @@ -461,7 +461,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - IgniteTx tx = cache.txStart(); + Transaction tx = cache.txStart(); assert cache.putx(key, val); @@ -526,7 +526,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - try (IgniteTx tx = cache.txStart()) { + try (Transaction tx = cache.txStart()) { assert cache.putIfAbsent(key, val) == null; assertEquals(val, cache.putIfAbsent(key, val)); @@ -594,7 +594,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe Iterator<Map.Entry<String, Integer>> iter = pairs(2).entrySet().iterator(); // Optimistic transaction. - try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { Map.Entry<String, Integer> e = iter.next(); String key = e.getKey(); @@ -671,7 +671,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe Integer val = e.getValue(); // Optimistic. - try (IgniteTx tx = cache.txStart()) { + try (Transaction tx = cache.txStart()) { assert !cache.putx(key, val, hasPeekVal); assert cache.putx(key, val, noPeekVal); @@ -706,7 +706,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe String key = e.getKey(); Integer val = e.getValue(); - try (IgniteTx tx = cache.txStart()) { + try (Transaction tx = cache.txStart()) { assert !cache.putx(key, val, hasPeekVal); assert cache.putx(key, val, noPeekVal); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 3e74af2..93c3a9c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -302,7 +302,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra } } try { - IgniteTx tx = atomicityMode() == TRANSACTIONAL ? ignite.transactions().txStart() : null; + Transaction tx = atomicityMode() == TRANSACTIONAL ? ignite.transactions().txStart() : null; try { cache.putAll(putMap); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 275dd5f..1ddf8a4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -31,15 +31,14 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; -import javax.cache.*; import java.util.*; import java.util.concurrent.locks.*; import static org.apache.ignite.IgniteState.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests for node failure in transactions. @@ -165,14 +164,14 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac * @param isolation Isolation. * @throws Exception If check failed. */ - private void checkTransaction(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Throwable { + private void checkTransaction(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Throwable { int idx = RAND.nextInt(GRID_CNT); info("Grid will be stopped: " + idx); Ignite g = grid(idx); - IgniteTx tx = g.transactions().txStart(concurrency, isolation); + Transaction tx = g.transactions().txStart(concurrency, isolation); try { g.jcache(null).put(KEY, VALUE); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index 2777111..713358d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -40,8 +40,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Test for TRANSFORM events recording. @@ -91,10 +91,10 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { private CacheAtomicityMode atomicityMode; /** TX concurrency. */ - private IgniteTxConcurrency txConcurrency; + private TransactionConcurrency txConcurrency; /** TX isolation. */ - private IgniteTxIsolation txIsolation; + private TransactionIsolation txIsolation; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -156,7 +156,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("unchecked") private void initialize(CacheMode cacheMode, CacheAtomicityMode atomicityMode, - IgniteTxConcurrency txConcurrency, IgniteTxIsolation txIsolation) throws Exception { + TransactionConcurrency txConcurrency, TransactionIsolation txIsolation) throws Exception { this.cacheMode = cacheMode; this.atomicityMode = atomicityMode; this.txConcurrency = txConcurrency; @@ -476,8 +476,8 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ - private void checkTx(CacheMode cacheMode, IgniteTxConcurrency txConcurrency, - IgniteTxIsolation txIsolation) throws Exception { + private void checkTx(CacheMode cacheMode, TransactionConcurrency txConcurrency, + TransactionIsolation 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/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java index d9c51c0..544ffbf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java @@ -125,7 +125,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { Collection<String> evts = firstStore.events(); - try (IgniteTx tx = grid.transactions().txStart()) { + try (Transaction tx = grid.transactions().txStart()) { IgniteCache<Object, Object> cacheA = grid.jcache("cacheA"); IgniteCache<Object, Object> cacheB = grid.jcache("cacheB"); @@ -166,7 +166,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { public void testIncompatibleCaches1() throws Exception { IgniteEx grid = grid(0); - try (IgniteTx ignored = grid.transactions().txStart()) { + try (Transaction ignored = grid.transactions().txStart()) { IgniteCache<Object, Object> cacheA = grid.jcache("cacheA"); IgniteCache<Object, Object> cacheC = grid.jcache("cacheC"); @@ -187,7 +187,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { public void testIncompatibleCaches2() throws Exception { IgniteEx grid = grid(0); - try (IgniteTx ignored = grid.transactions().txStart()) { + try (Transaction ignored = grid.transactions().txStart()) { IgniteCache<Object, Object> cacheA = grid.jcache("cacheA"); IgniteCache<Object, Object> cacheC = grid.jcache("cacheD"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index 043f54f..4f5da0b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -33,8 +33,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * @@ -156,7 +156,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom Collections.sort(keys); - try (IgniteTx tx = grid.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { Map<Integer, Integer> map = cache.getAll(new LinkedHashSet<Integer>(keys)); for (Map.Entry<Integer, Integer> entry : map.entrySet()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 8b6fdb8..378aa4d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -37,7 +37,7 @@ import org.apache.ignite.testframework.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; /** * Abstract test for originating node failure. @@ -156,7 +156,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri assertNotNull(cache); - IgniteTxProxyImpl tx = (IgniteTxProxyImpl)txIgniteNode.transactions().txStart(); + TransactionProxyImpl tx = (TransactionProxyImpl)txIgniteNode.transactions().txStart(); IgniteInternalTx txEx = GridTestUtils.getFieldValue(tx, "tx"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index cf18e96..1fe79f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -39,7 +39,7 @@ import org.apache.ignite.transactions.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; /** * Abstract test for originating node failure. @@ -177,18 +177,18 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest assertNotNull(cache); - IgniteTx tx = originatingNodeGrid.transactions().txStart(); + Transaction tx = originatingNodeGrid.transactions().txStart(); try { cache.putAll(map); info("Before commitAsync"); - tx = (IgniteTx)tx.withAsync(); + tx = (Transaction)tx.withAsync(); tx.commit(); - IgniteFuture<IgniteTx> fut = tx.future(); + IgniteFuture<Transaction> fut = tx.future(); info("Got future for commitAsync()."); @@ -322,13 +322,13 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest assertNotNull(cache); - try (IgniteTx tx = grid(0).transactions().txStart()) { + try (Transaction tx = grid(0).transactions().txStart()) { cache.getAll(keys); // Should not send any messages. cache.putAll(map); - IgniteTxProxyImpl txProxy = (IgniteTxProxyImpl)tx; + TransactionProxyImpl txProxy = (TransactionProxyImpl)tx; IgniteInternalTx txEx = txProxy.tx(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 462b3ce..370e118 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; /** * Tests transaction during cache preloading. @@ -149,7 +149,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT * @param txConcurrency Transaction concurrency; * @throws Exception If failed. */ - private void testLocalTxPreloading(IgniteTxConcurrency txConcurrency) throws Exception { + private void testLocalTxPreloading(TransactionConcurrency txConcurrency) throws Exception { Map<String, Integer> map = new HashMap<>(); for (int i = 0; i < 10000; i++) @@ -172,7 +172,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT IgniteTransactions txs = ignite(i).transactions(); - try (IgniteTx tx = txs.txStart(txConcurrency, IgniteTxIsolation.READ_COMMITTED)) { + try (Transaction tx = txs.txStart(txConcurrency, TransactionIsolation.READ_COMMITTED)) { cache.invoke(TX_KEY, new EntryProcessor<String, Integer, Void>() { @Override public Void process(MutableEntry<String, Integer> e, Object... args) { Integer val = e.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index 2cccd71..0e9bb64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -25,8 +25,8 @@ import org.apache.ignite.transactions.*; import javax.cache.*; import java.util.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Simple cache test. @@ -124,14 +124,14 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws IgniteCheckedException If test failed. */ - private void checkTransactionTimeout(IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) throws Exception { + private void checkTransactionTimeout(TransactionConcurrency concurrency, + TransactionIsolation isolation) throws Exception { int idx = RAND.nextInt(GRID_COUNT); IgniteCache<Integer, String> cache = jcache(idx); - IgniteTx tx = ignite(idx).transactions().txStart(concurrency, isolation, TIMEOUT, 0); + Transaction tx = ignite(idx).transactions().txStart(concurrency, isolation, TIMEOUT, 0); try { info("Storing value in cache [key=1, val=1]"); @@ -155,7 +155,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { assert false : "Timeout never happened for transaction: " + tx; } catch (CacheException e) { - if (!(e.getCause() instanceof IgniteTxTimeoutException)) + if (!(e.getCause() instanceof TransactionTimeoutException)) throw e; info("Received expected timeout exception [msg=" + e.getMessage() + ", tx=" + tx + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index 634df50..f53b1d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java @@ -35,8 +35,8 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests write-through. @@ -244,7 +244,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri * @param op Op. * @throws Exception If failed. */ - protected void checkTransform(IgniteTxConcurrency concurrency, int nodeType, int op) throws Exception { + protected void checkTransform(TransactionConcurrency concurrency, int nodeType, int op) throws Exception { IgniteCache<String, Integer> cache = jcache(0); Collection<String> keys = keysForType(nodeType); @@ -261,7 +261,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri info(">>> Starting transform transaction"); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, READ_COMMITTED)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, READ_COMMITTED)) { if (op == OP_UPDATE) { for (String key : keys) cache.invoke(key, INCR_CLOS); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 02fcf6e..21f2c52 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -40,8 +40,8 @@ import java.util.concurrent.locks.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests for colocated cache. @@ -429,7 +429,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { g0.jcache(null).put(i, i); for (int i = 0; i < 100; i++) { - try (IgniteTx tx = g0.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = g0.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer val = (Integer) g0.jcache(null).get(i); assertEquals((Integer) i, val); @@ -447,12 +447,12 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @param isolation Tx isolation. * @throws Exception If failed. */ - private void checkSinglePut(boolean explicitTx, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) + private void checkSinglePut(boolean explicitTx, TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { startGrid(); try { - IgniteTx tx = explicitTx ? grid().transactions().txStart(concurrency, isolation) : null; + Transaction tx = explicitTx ? grid().transactions().txStart(concurrency, isolation) : null; try { IgniteCache<Object, Object> cache = jcache(); @@ -483,11 +483,11 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @param isolation Tx isolation. * @throws Exception If failed. */ - private void checkReentry(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { + private void checkReentry(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { startGrid(); try { - IgniteTx tx = grid().transactions().txStart(concurrency, isolation); + Transaction tx = grid().transactions().txStart(concurrency, isolation); try { IgniteCache<Object, Object> cache = jcache(); @@ -528,8 +528,8 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("AssertEqualsBetweenInconvertibleTypes") - private void checkDistributedPut(boolean explicitTx, boolean separate, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) throws Exception { + private void checkDistributedPut(boolean explicitTx, boolean separate, TransactionConcurrency concurrency, + TransactionIsolation isolation) throws Exception { storeEnabled = false; startGridsMultiThreaded(3); @@ -545,7 +545,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { Map<Integer, String> map = F.asMap(k0, "val" + k0, k1, "val" + k1, k2, "val" + k2); - IgniteTx tx = explicitTx ? g0.transactions().txStart(concurrency, isolation) : null; + Transaction tx = explicitTx ? g0.transactions().txStart(concurrency, isolation) : null; try { if (separate) { @@ -618,8 +618,8 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("AssertEqualsBetweenInconvertibleTypes") - private void checkNonLocalPuts(boolean explicitTx, boolean separate, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) throws Exception { + private void checkNonLocalPuts(boolean explicitTx, boolean separate, TransactionConcurrency concurrency, + TransactionIsolation isolation) throws Exception { storeEnabled = false; startGridsMultiThreaded(3); @@ -634,7 +634,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { Map<Integer, String> map = F.asMap(k1, "val" + k1, k2, "val" + k2); - IgniteTx tx = explicitTx ? g0.transactions().txStart(concurrency, isolation) : null; + Transaction tx = explicitTx ? g0.transactions().txStart(concurrency, isolation) : null; try { if (separate) { @@ -747,7 +747,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { clearStores(3); - try (IgniteTx tx = g0.transactions().txStart(OPTIMISTIC, READ_COMMITTED)) { + try (Transaction tx = g0.transactions().txStart(OPTIMISTIC, READ_COMMITTED)) { g0.jcache(null).putAll(map); tx.commit(); @@ -799,7 +799,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("AssertEqualsBetweenInconvertibleTypes") - private void checkRollback(boolean separate, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) + private void checkRollback(boolean separate, TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { storeEnabled = false; @@ -820,7 +820,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { Map<Integer, String> map = F.asMap(k0, "value" + k0, k1, "value" + k1, k2, "value" + k2); - IgniteTx tx = g0.transactions().txStart(concurrency, isolation); + Transaction tx = g0.transactions().txStart(concurrency, isolation); try { if (separate) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index 5e920f7..cf10862 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -31,8 +31,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Test ensuring that values are visible inside OPTIMISTIC transaction in co-located cache. @@ -116,7 +116,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA */ public void testOptimisticTransaction() throws Exception { for (IgniteCache<Integer, String> cache : caches) { - IgniteTx tx = cache.unwrap(Ignite.class).transactions().txStart(OPTIMISTIC, REPEATABLE_READ); + Transaction tx = cache.unwrap(Ignite.class).transactions().txStart(OPTIMISTIC, REPEATABLE_READ); try { cache.put(KEY, VAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java index b32c7d3..8e65e59 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java @@ -110,7 +110,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { } for (int i = 0; i < GRID_CNT; i++) { - IgniteTx tx = grid(i).transactions().tx(); + Transaction tx = grid(i).transactions().tx(); if (tx != null) tx.close(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index 42b74c7..c64f9a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; @@ -43,8 +42,8 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests that new transactions do not start until partition exchange is completed. @@ -262,7 +261,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra IgniteCache<Integer, Integer> cache = node.jcache(null); try { - try (IgniteTx tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { cache.put(key, key); info(">>> Locked key, waiting for latch: " + key); @@ -333,7 +332,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra int key = (int)Thread.currentThread().getId(); try { - try (IgniteTx tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // This method should block until all previous transactions are completed. cache.put(key, key); @@ -416,7 +415,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra IgniteCache<Integer, Integer> cache = node.jcache(null); try { - try (IgniteTx tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { cache.put(key, key); commitLatch.await(); @@ -469,7 +468,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra int key = (int)Thread.currentThread().getId(); try { - try (IgniteTx tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // This method should block until all previous transactions are completed. cache.put(key, key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java index 89bc2e1..5fd76e2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java @@ -31,8 +31,8 @@ import java.util.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Simple test for preloading in ATOMIC cache. @@ -89,7 +89,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - private void checkSimpleTxs(boolean nearEnabled, IgniteTxConcurrency concurrency) throws Exception { + private void checkSimpleTxs(boolean nearEnabled, TransactionConcurrency concurrency) throws Exception { try { this.nearEnabled = nearEnabled; @@ -112,7 +112,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { info("Checking transaction for key [idx=" + i + ", key=" + key + ']'); info(">>>>>>>>>>>>>>>"); - try (IgniteTx tx = txs.txStart(concurrency, REPEATABLE_READ)) { + try (Transaction tx = txs.txStart(concurrency, REPEATABLE_READ)) { try { // Lock if pessimistic, read if optimistic. cache.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index 6eba373..1a6a4ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -35,8 +35,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Test getting the same value twice within the same transaction. @@ -219,7 +219,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(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) + private void checkDoubleGet(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put) throws Exception { IgniteEx ignite = grid(0); IgniteCache<Integer, String> cache = ignite.jcache(null); @@ -231,7 +231,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { if (put) cache.put(key, val = Integer.toString(key)); - IgniteTx tx = ignite.transactions().txStart(concurrency, isolation, 0, 0); + Transaction tx = ignite.transactions().txStart(concurrency, isolation, 0, 0); try { if (isTestDebug()) { @@ -266,7 +266,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { if (isTestDebug()) info("Committed transaction: " + tx); } - catch (IgniteTxOptimisticException e) { + catch (TransactionOptimisticException e) { if (concurrency != OPTIMISTIC || isolation != SERIALIZABLE) { error("Received invalid optimistic failure.", e); @@ -301,7 +301,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { throw e; } finally { - IgniteTx t = ignite.transactions().tx(); + Transaction t = ignite.transactions().tx(); assert t == null : "Thread should not have transaction upon completion ['t==tx'=" + (t == tx) + ", t=" + t + (t != tx ? "tx=" + tx : "tx=''") + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index 32cf658..78659a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -45,8 +45,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Multi node test for near cache. @@ -166,7 +166,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { store.reset(); for (int i = 0; i < GRID_CNT; i++) { - IgniteTx tx = grid(i).transactions().tx(); + Transaction tx = grid(i).transactions().tx(); if (tx != null) { error("Ending zombie transaction: " + tx); @@ -376,7 +376,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, String> near = jcache(0); if (transactional()) { - try (IgniteTx tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ, 0, 0)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ, 0, 0)) { near.put(2, "2"); String s = near.getAndPut(3, "3"); @@ -509,7 +509,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, String> near = jcache(0); if (transactional()) { - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ, 0, 0)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ, 0, 0)) { near.put(2, "2"); String s = near.getAndPut(3, "3"); @@ -823,7 +823,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { if (transactional()) { - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // Simple transaction get. assertEquals(val, cache.get(key)); @@ -868,7 +868,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { assertNull(near(1).peekNearOnly(key)); if (transactional()) { - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // Read. assertEquals(val, cache.get(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java index 9fb2441..1df44f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java @@ -34,8 +34,8 @@ import java.util.concurrent.locks.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Single node test for near cache. @@ -155,7 +155,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { IgniteCache<Object, Object> near = jcache(); GridCacheAdapter<Integer, String> dht = dht(); - try (IgniteTx tx = grid().transactions().txStart(OPTIMISTIC, REPEATABLE_READ) ) { + try (Transaction tx = grid().transactions().txStart(OPTIMISTIC, REPEATABLE_READ) ) { near.put(2, "2"); near.put(3, "3"); @@ -289,7 +289,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { assertEquals("val1", dht().peek(1)); assertNull(near().peekNearOnly(1)); - IgniteTx tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ); + Transaction tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ); assertEquals("val1", cache.get(1)); @@ -308,7 +308,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { assertEquals("val1", dht().peek(1)); assertNull(near().peekNearOnly(1)); - IgniteTx tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ); + Transaction tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ); assertEquals("val1", cache.get(1)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index b4f6654..f297427 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -237,7 +237,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio int fullIdx = nearIdx == 0 ? 1 : 0; // Now commit transaction and check that ttl and expire time have been saved. - IgniteTx tx = inTx ? grid(fullIdx).transactions().txStart() : null; + Transaction tx = inTx ? grid(fullIdx).transactions().txStart() : null; try { jcache(fullIdx).withExpiryPolicy(expiry).put(key, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java index 410d890..ded7c89 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java @@ -35,8 +35,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Near-only cache node startup test. @@ -188,7 +188,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { // Test optimistic transaction. GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { - try (IgniteTx tx = igniteNearOnly.transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = igniteNearOnly.transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { nearOnly.put("key", "val"); tx.commit(); @@ -201,7 +201,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest { // Test pessimistic transaction. GridTestUtils.assertThrowsWithCause(new Callable<Object>() { @Override public Object call() throws Exception { - try (IgniteTx tx = igniteNearOnly.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = igniteNearOnly.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { nearOnly.put("key", "val"); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java index 01de425..e5a403b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java @@ -18,12 +18,10 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.util.typedef.*; @@ -40,8 +38,8 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests near transactions. @@ -136,7 +134,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { IgniteCache cache = priIgnite.jcache(null); - IgniteTx tx = priIgnite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ); + Transaction tx = priIgnite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ); try { cache.get(mainKey); @@ -196,11 +194,11 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { * @param isolation Transaction isolation. * @throws Exception If failed. */ - private void testReadersUpdate(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { + private void testReadersUpdate(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { Ignite ignite = grid(0); IgniteCache<Integer, Integer> cache = ignite.jcache(null); - try (IgniteTx tx = ignite.transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite.transactions().txStart(concurrency, isolation)) { for (int i = 0; i < 100; i++) cache.put(i, 1); @@ -215,7 +213,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { assertEquals((Integer)1, c.get(i)); } - try (IgniteTx tx = ignite.transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite.transactions().txStart(concurrency, isolation)) { for (int i = 0; i < 100; i++) cache.put(i, 2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java index f6d66b8..c284c29 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java @@ -36,8 +36,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * @@ -312,7 +312,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA IgniteCache<Integer, String> cache = jcache(0); //GridCache<Integer, String> cache = cache(0); - try (IgniteTx tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { cache.put(1, "val"); cache.put(2, "val"); cache.put(3, "val"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java index 22228d9..13a7771 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java @@ -35,8 +35,8 @@ import javax.cache.expiry.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests for partitioned cache automatic eviction. @@ -157,7 +157,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT * @param concurrency Tx concurrency. * @param isolation Tx isolation. */ - private void doTestEviction(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) + private void doTestEviction(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { assert concurrency != null; assert isolation != null; @@ -181,7 +181,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT IgniteTransactions txs = G.ignite(node.id()).transactions(); - try (IgniteTx tx = txs.txStart(concurrency, isolation)) { + try (Transaction tx = txs.txStart(concurrency, isolation)) { assert c.get(key) == null; c.withExpiryPolicy(plc).put(key, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java index 69c72d6..bf1f9e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -113,7 +112,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT private void doPutAndRollback() throws Exception { IgniteCache<Object, Object> c = jcache(); - try (IgniteTx tx = grid().transactions().txStart()) { + try (Transaction tx = grid().transactions().txStart()) { c.put(1, 1); tx.rollback();
