http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java index 11a91b5..9da6ea6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java @@ -98,7 +98,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); - GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, true); GridCacheMvccCandidate c2 = entry.addNearLocal(node1, 1, ver2, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); @@ -133,7 +133,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver2 = version(2); GridCacheMvccCandidate c1 = entry.addNearLocal(node1, 1, ver1, true); - GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); Collection<GridCacheMvccCandidate> nearLocCands = entry.localCandidates(); @@ -166,7 +166,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver2 = version(2); GridCacheMvccCandidate c1 = entry.addNearLocal(node1, 1, ver1, true); - GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); Collection<GridCacheMvccCandidate> nearLocCands = entry.localCandidates(); @@ -228,7 +228,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); - GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, true); GridCacheMvccCandidate c2 = entry.addNearLocal(node1, 1, ver2, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); @@ -271,7 +271,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { entry.readyNearLocal(ver1, ver1, empty(), empty(), Collections.singletonList(ver0)); - entry.addRemote(node1, 1, ver0, false, true); + entry.addRemote(node1, 1, ver0, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); Collection<GridCacheMvccCandidate> nearLocCands = entry.localCandidates(); @@ -305,9 +305,9 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { entry.readyNearLocal(ver3, ver3, empty(), empty(), Arrays.asList(ver0, ver1, ver2)); - GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true); - GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true); - GridCacheMvccCandidate c0 = entry.addRemote(node1, 1, ver0, false, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, true); + GridCacheMvccCandidate c0 = entry.addRemote(node1, 1, ver0, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); @@ -349,8 +349,8 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { entry.readyNearLocal(ver3, ver3, empty(), empty(), Arrays.asList(ver0, ver1, ver2)); - GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true); - GridCacheMvccCandidate c0 = entry.addRemote(node1, 1, ver0, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, true); + GridCacheMvccCandidate c0 = entry.addRemote(node1, 1, ver0, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); @@ -390,12 +390,12 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver5 = version(5); GridCacheVersion ver6 = version(6); - entry.addRemote(node1, 1, ver1, false, true); - entry.addRemote(node1, 1, ver2, false, true); + entry.addRemote(node1, 1, ver1, true); + entry.addRemote(node1, 1, ver2, true); GridCacheMvccCandidate c3 = entry.addNearLocal(node1, 1, ver3, true); - GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, false, true); - entry.addRemote(node1, 1, ver5, false, true); - entry.addRemote(node1, 1, ver6, false, true); + GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, true); + entry.addRemote(node1, 1, ver5, true); + entry.addRemote(node1, 1, ver6, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); @@ -446,9 +446,9 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver2 = version(20); GridCacheVersion ver3 = version(30); - entry.addRemote(node1, 1, ver1, false, true); + entry.addRemote(node1, 1, ver1, true); entry.addNearLocal(node1, 1, nearVer2, true); - entry.addRemote(node1, 1, ver3, false, true); + entry.addRemote(node1, 1, ver3, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); Collection<GridCacheMvccCandidate> nearLocCands = entry.localCandidates(); @@ -484,9 +484,9 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver2 = version(20); GridCacheVersion ver3 = version(30); - entry.addRemote(node1, 1, ver1, false, true); + entry.addRemote(node1, 1, ver1, true); entry.addNearLocal(node1, 1, nearVer2, true); - entry.addRemote(node1, 1, ver3, false, true); + entry.addRemote(node1, 1, ver3, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); Collection<GridCacheMvccCandidate> nearLocCands = entry.localCandidates(); @@ -529,9 +529,9 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver2 = version(20); GridCacheVersion ver3 = version(30); - entry.addRemote(node1, 1, ver1, false, true); + entry.addRemote(node1, 1, ver1, true); entry.addNearLocal(node1, 1, nearVer2, true); - entry.addRemote(node1, 1, ver3, false, true); + entry.addRemote(node1, 1, ver3, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); Collection<GridCacheMvccCandidate> nearLocCands = entry.localCandidates(); @@ -574,9 +574,9 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { GridCacheVersion ver2 = version(20); GridCacheVersion ver3 = version(30); - entry.addRemote(node1, 1, ver1, false, true); + entry.addRemote(node1, 1, ver1, true); entry.addNearLocal(node1, 1, nearVer2, true); - entry.addRemote(node1, 1, ver3, false, true); + entry.addRemote(node1, 1, ver3, true); Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); Collection<GridCacheMvccCandidate> nearLocCands = entry.localCandidates(); @@ -1075,4 +1075,4 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { assert cand.local(); } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java index f46b290..d352e26 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java @@ -129,14 +129,14 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver4 = version(4); GridCacheVersion ver5 = version(5); - entry.addRemote(node1, 1, ver1, false, true); + entry.addRemote(node1, 1, ver1, true); Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot(); assert cands.size() == 1; assert cands.iterator().next().version().equals(ver1); - entry.addRemote(node2, 5, ver5, false, true); + entry.addRemote(node2, 5, ver5, true); cands = entry.remoteMvccSnapshot(); @@ -147,7 +147,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { // Check order. checkOrder(cands, ver1, ver5); - entry.addRemote(node1, 3, ver3, false, true); + entry.addRemote(node1, 3, ver3, true); cands = entry.remoteMvccSnapshot(); @@ -162,7 +162,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkDone(entry.candidate(ver3)); - entry.addRemote(node1, 2, ver2, false, true); + entry.addRemote(node1, 2, ver2, true); cands = entry.remoteMvccSnapshot(); @@ -197,7 +197,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkDone(entry.candidate(ver5)); - entry.addRemote(node1, 4, ver4, false, true); + entry.addRemote(node1, 4, ver4, true); cands = entry.remoteMvccSnapshot(); @@ -278,10 +278,10 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver3 = version(3); GridCacheVersion ver4 = version(4); - GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true); - GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true); - GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, false, true); - GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, true); + GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, true); + GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, true); GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c1, c2, c3, c4}; @@ -322,12 +322,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver5 = version(5); GridCacheVersion ver6 = version(6); - GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true); - GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true); - GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, false, true); - GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, false, true); - GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, false, true); - GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, true); + GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, true); + GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, true); + GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, true); + GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, true); GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c1, c2, c3, c4, c5, c6}; @@ -369,13 +369,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver5 = version(5); GridCacheVersion ver6 = version(6); - GridCacheMvccCandidate c0 = entry.addRemote(node1, 1, ver0, false, true); - GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true); - GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true); - GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, false, true); - GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, false, true); - GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, false, true); - GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, false, true); + GridCacheMvccCandidate c0 = entry.addRemote(node1, 1, ver0, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, true); + GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, true); + GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, true); + GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, true); + GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, true); GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c0, c1, c2, c3, c4, c5, c6}; @@ -486,7 +486,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver2 = version(2); GridCacheVersion ver3 = version(3); - entry.addRemote(nodeId, 1, ver2, false, true); + entry.addRemote(nodeId, 1, ver2, true); entry.addLocal(3, ver3, 0, false, true); @@ -529,15 +529,15 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver7 = version(7); GridCacheVersion ver8 = version(8); - entry.addRemote(node1, 1, ver1, false, true); - entry.addRemote(node2, 2, ver2, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); - entry.addRemote(node1, 5, ver5, false, true); - entry.addRemote(node2, 7, ver7, false, true); - entry.addRemote(node2, 8, ver8, false, true); + entry.addRemote(node1, 1, ver1, true); + entry.addRemote(node2, 2, ver2, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); + entry.addRemote(node1, 5, ver5, true); + entry.addRemote(node2, 7, ver7, true); + entry.addRemote(node2, 8, ver8, true); - GridCacheMvccCandidate doomed = entry.addRemote(node2, 6, ver6, false, true); + GridCacheMvccCandidate doomed = entry.addRemote(node2, 6, ver6, true); // No reordering happens. checkOrder(entry.remoteMvccSnapshot(), ver1, ver2, ver3, ver4, ver5, ver7, ver8, ver6); @@ -581,13 +581,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver6 = version(6); GridCacheVersion ver7 = version(7); - entry.addRemote(node1, 1, ver1, false, true); - entry.addRemote(node2, 2, ver2, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); - entry.addRemote(node1, 5, ver5, false, true); - entry.addRemote(node2, 6, ver6, false, true); - entry.addRemote(node2, 7, ver7, false, true); + entry.addRemote(node1, 1, ver1, true); + entry.addRemote(node2, 2, ver2, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); + entry.addRemote(node1, 5, ver5, true); + entry.addRemote(node2, 6, ver6, true); + entry.addRemote(node2, 7, ver7, true); List<GridCacheVersion> committed = Arrays.asList(ver4, ver6, ver2); @@ -623,13 +623,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver6 = version(6); GridCacheVersion ver7 = version(7); - entry.addRemote(node1, 1, ver1, false, true); - entry.addRemote(node2, 2, ver2, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); - entry.addRemote(node1, 5, ver5, false, true); - entry.addRemote(node2, 6, ver6, false, true); - entry.addRemote(node2, 7, ver7, false, true); + entry.addRemote(node1, 1, ver1, true); + entry.addRemote(node2, 2, ver2, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); + entry.addRemote(node1, 5, ver5, true); + entry.addRemote(node2, 6, ver6, true); + entry.addRemote(node2, 7, ver7, true); List<GridCacheVersion> completed = Arrays.asList(ver4, ver6); @@ -669,11 +669,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver6 = version(6); GridCacheVersion ver7 = version(7); - entry.addRemote(node1, 1, ver1, false, false); - entry.addRemote(node2, 2, ver2, false, false); - entry.addRemote(node1, 3, ver3, false, false); - entry.addRemote(node2, 4, ver4, false, false); - entry.addRemote(node1, 5, ver5, false, false); + entry.addRemote(node1, 1, ver1, false); + entry.addRemote(node2, 2, ver2, false); + entry.addRemote(node1, 3, ver3, false); + entry.addRemote(node2, 4, ver4, false); + entry.addRemote(node1, 5, ver5, false); List<GridCacheVersion> committed = Arrays.asList(ver6, ver7); @@ -708,13 +708,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver6 = version(6); GridCacheVersion ver7 = version(7); - entry.addRemote(node1, 1, ver1, false, false); - entry.addRemote(node2, 2, ver2, false, false); - entry.addRemote(node1, 3, ver3, false, false); - entry.addRemote(node2, 4, ver4, false, false); - entry.addRemote(node1, 5, ver5, false, false); - entry.addRemote(node2, 6, ver6, false, false); - entry.addRemote(node2, 7, ver7, false, false); + entry.addRemote(node1, 1, ver1, false); + entry.addRemote(node2, 2, ver2, false); + entry.addRemote(node1, 3, ver3, false); + entry.addRemote(node2, 4, ver4, false); + entry.addRemote(node1, 5, ver5, false); + entry.addRemote(node2, 6, ver6, false); + entry.addRemote(node2, 7, ver7, false); List<GridCacheVersion> committed = Arrays.asList(ver4, ver6, ver3); @@ -750,11 +750,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver6 = version(6); GridCacheVersion ver7 = version(7); - entry.addRemote(node1, 1, ver1, false, false); - entry.addRemote(node2, 2, ver2, false, false); - entry.addRemote(node1, 3, ver3, false, false); - entry.addRemote(node2, 4, ver4, false, false); - entry.addRemote(node1, 5, ver5, false, false); + entry.addRemote(node1, 1, ver1, false); + entry.addRemote(node2, 2, ver2, false); + entry.addRemote(node1, 3, ver3, false); + entry.addRemote(node2, 4, ver4, false); + entry.addRemote(node1, 5, ver5, false); List<GridCacheVersion> committed = Arrays.asList(ver6, ver7); @@ -789,11 +789,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver6 = version(6); GridCacheVersion ver7 = version(7); - entry.addRemote(node1, 1, ver1, false, false); - entry.addRemote(node2, 2, ver2, false, false); - entry.addRemote(node1, 3, ver3, false, false); - entry.addRemote(node2, 4, ver4, false, false); - entry.addRemote(node1, 5, ver5, false, false); + entry.addRemote(node1, 1, ver1, false); + entry.addRemote(node2, 2, ver2, false); + entry.addRemote(node1, 3, ver3, false); + entry.addRemote(node2, 4, ver4, false); + entry.addRemote(node1, 5, ver5, false); List<GridCacheVersion> committed = Arrays.asList(ver6, ver7); @@ -829,12 +829,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver7 = version(7); // Don't add version 2. - entry.addRemote(node1, 1, ver1, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); - entry.addRemote(node1, 5, ver5, false, true); - entry.addRemote(node2, 6, ver6, false, true); - entry.addRemote(node2, 7, ver7, false, true); + entry.addRemote(node1, 1, ver1, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); + entry.addRemote(node1, 5, ver5, true); + entry.addRemote(node2, 6, ver6, true); + entry.addRemote(node2, 7, ver7, true); List<GridCacheVersion> committed = Arrays.asList(ver6, ver4); @@ -870,9 +870,9 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver7 = version(7); // Don't add versions 2, 5, 6, 7. - entry.addRemote(node1, 1, ver1, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); + entry.addRemote(node1, 1, ver1, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); List<GridCacheVersion> committed = Arrays.asList(ver6, ver5, ver7); @@ -905,12 +905,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver7 = version(7); // Don't add version 1. - entry.addRemote(node1, 2, ver2, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); - entry.addRemote(node1, 5, ver5, false, true); - entry.addRemote(node2, 6, ver6, false, true); - entry.addRemote(node2, 7, ver7, false, true); + entry.addRemote(node1, 2, ver2, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); + entry.addRemote(node1, 5, ver5, true); + entry.addRemote(node2, 6, ver6, true); + entry.addRemote(node2, 7, ver7, true); List<GridCacheVersion> committed = Arrays.asList(ver4, ver6, ver3); @@ -946,12 +946,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver7 = version(7); // Don't add version 6, 7 - entry.addRemote(node1, 2, ver2, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); - entry.addRemote(node1, 5, ver5, false, true); - entry.addRemote(node1, 6, ver6, false, true); - entry.addRemote(node1, 7, ver7, false, true); + entry.addRemote(node1, 2, ver2, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); + entry.addRemote(node1, 5, ver5, true); + entry.addRemote(node1, 6, ver6, true); + entry.addRemote(node1, 7, ver7, true); List<GridCacheVersion> committed = Arrays.asList(ver2, ver3); @@ -987,10 +987,10 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver7 = version(7); // Don't add version 5, 6, 7 - entry.addRemote(node1, 1, ver1, false, true); - entry.addRemote(node1, 2, ver2, false, true); - entry.addRemote(node1, 3, ver3, false, true); - entry.addRemote(node2, 4, ver4, false, true); + entry.addRemote(node1, 1, ver1, true); + entry.addRemote(node1, 2, ver2, true); + entry.addRemote(node1, 3, ver3, true); + entry.addRemote(node2, 4, ver4, true); List<GridCacheVersion> committed = Arrays.asList(ver6, ver7); @@ -1021,7 +1021,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver4 = version(4); GridCacheVersion ver5 = version(5); - entry.addRemote(node1, 1, ver1, false, false); + entry.addRemote(node1, 1, ver1, false); entry.addLocal(2, ver2, 0, true, true); Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot(); @@ -1029,7 +1029,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { assert cands.size() == 1; assert cands.iterator().next().version().equals(ver1); - entry.addRemote(node2, 5, ver5, false, false); + entry.addRemote(node2, 5, ver5, false); cands = entry.remoteMvccSnapshot(); @@ -1040,7 +1040,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkOrder(cands, ver1, ver5); checkOrder(entry.localCandidates(true), ver2); - entry.addRemote(node1, 3, ver3, false, true); + entry.addRemote(node1, 3, ver3, true); entry.addLocal(4, ver4, 0, /*reenter*/true, false); cands = entry.remoteMvccSnapshot(); @@ -1174,11 +1174,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { linkCandidates(ctx, c13, c33); - entry2.addRemote(nodeId, 3, ver2, false, true); + entry2.addRemote(nodeId, 3, ver2, true); checkLocal(entry2.candidate(ver1), ver1, true, false, false); - entry3.addRemote(nodeId, 3, ver2, false, false); + entry3.addRemote(nodeId, 3, ver2, false); entry3.readyLocal(ver3); @@ -1245,11 +1245,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { linkCandidates(ctx, c13, c33); - entry2.addRemote(UUID.randomUUID(), 3, ver1, false, true); + entry2.addRemote(UUID.randomUUID(), 3, ver1, true); checkLocal(entry2.candidate(ver2), ver2, true, false, false); - entry3.addRemote(UUID.randomUUID(), 3, ver1, false, true); + entry3.addRemote(UUID.randomUUID(), 3, ver1, true); entry3.readyLocal(ver3); @@ -1421,7 +1421,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(c1k1, ver2, true, true, false); - GridCacheMvccCandidate c2k1 = entry1.addRemote(id, 2, ver1, false, true); + GridCacheMvccCandidate c2k1 = entry1.addRemote(id, 2, ver1, true); // Force recheck of assignments. entry1.recheckLock(); @@ -1437,7 +1437,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { assert c1k2.previous() == c1k1; - GridCacheMvccCandidate c2k2 = entry2.addRemote(id, 3, ver1, false, true); + GridCacheMvccCandidate c2k2 = entry2.addRemote(id, 3, ver1, true); entry2.readyLocal(c1k2); @@ -1479,8 +1479,8 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(v3k2, ver3, false, false, false); // Remote locks. - GridCacheMvccCandidate v2k1 = entry1.addRemote(id, 3, ver2, false, false); - GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 3, ver2, false, false); + GridCacheMvccCandidate v2k1 = entry1.addRemote(id, 3, ver2, false); + GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 3, ver2, false); checkRemote(v2k1, ver2, false, false); checkRemote(v2k2, ver2, false, false); @@ -1602,7 +1602,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(v1k1, ver1, true, false, false); checkLocal(v1k2, ver1, true, false, false); - GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 5, ver2, false, false); + GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 5, ver2, false); checkRemote(v2k2, ver2, false, false); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java index e70c97b..176751f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java @@ -161,7 +161,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { try { cacheOperations(node, cache); } - catch (Exception e) { + catch (Exception ignored) { if (node.isStopping()) break; } @@ -322,4 +322,4 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index e3b4e9b..9fdadf3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -158,12 +158,11 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr * @param nodeId Node ID. * @param threadId Thread ID. * @param ver Lock version. - * @param ec Not used. * @param tx Transaction flag. * @return Remote candidate. */ GridCacheMvccCandidate addRemote(UUID nodeId, long threadId, GridCacheVersion ver, - boolean ec, boolean tx) { + boolean tx) { return mvcc.addRemote(this, nodeId, null, threadId, ver, tx, true, false); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java index 5f2c004..d30aad5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheUtilsSelfTest.java @@ -75,7 +75,7 @@ public class GridCacheUtilsSelfTest extends GridCommonAbstractTest { * @return {@code False}. */ @SuppressWarnings("CovariantEquals") - public boolean equals(String obj) { + @Override public boolean equals(Object obj) { return false; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java index e1d1650..c6e4394 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java @@ -102,7 +102,7 @@ public class GridProjectionForCachesOnDaemonNodeSelfTest extends GridCommonAbstr try { daemon.cluster().forDataNodes(null); } - catch (IllegalStateException e) { + catch (IllegalStateException ignored) { return; } @@ -120,7 +120,7 @@ public class GridProjectionForCachesOnDaemonNodeSelfTest extends GridCommonAbstr try { daemon.cluster().forClientNodes(null); } - catch (IllegalStateException e) { + catch (IllegalStateException ignored) { return; } @@ -138,10 +138,10 @@ public class GridProjectionForCachesOnDaemonNodeSelfTest extends GridCommonAbstr try { daemon.cluster().forCacheNodes(null); } - catch (IllegalStateException e) { + catch (IllegalStateException ignored) { return; } fail(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java index 6b0e193..e77c677 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java @@ -4143,8 +4143,6 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar cache.put("key1", 1); cache.put("key2", 2); - Map map = new HashMap<>(); - for (int i = 0; i < gridCount(); i++) { for (Cache.Entry entry : jcache(i)) storeStgy.putToStore(entry.getKey(), entry.getValue()); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java index 48acdfc..a8e9403 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.Map; import java.util.Set; import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.F; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java index 7ac68db..1f923f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java @@ -107,7 +107,7 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac assert grid(0).cache(cacheName).get(KEY_VAL).equals(KEY_VAL); } - catch (CacheException ex) { + catch (CacheException ignored) { assert false : "topology validation broken"; } } @@ -121,7 +121,7 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac try { assert grid(0).cache(cacheName).get(KEY_VAL).equals(KEY_VAL); } - catch (CacheException ex) { + catch (CacheException ignored) { assert false : "topology validation broken"; } } @@ -212,4 +212,4 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac putValid(CACHE_NAME_2); remove(CACHE_NAME_2); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java index dff0344..9eacb13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java @@ -27,7 +27,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.IgniteException; import org.apache.ignite.cache.affinity.AffinityFunction; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -456,4 +455,4 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { /** Cache remove. */ REMOVE } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java index 2b524e8..c016954 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java @@ -168,7 +168,7 @@ public class IgniteTxConfigCacheSelfTest extends GridCommonAbstractTest { fail("Timeout exception must be thrown"); } - catch (CacheException e) { + catch (CacheException ignored) { // No-op. } finally { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 95161c3..41d5c9a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -28,7 +28,6 @@ import javax.cache.processor.EntryProcessor; import javax.cache.processor.MutableEntry; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; -import org.apache.ignite.Ignition; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; @@ -710,4 +709,4 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac // No-op. } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index f13ba8c..07e30e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -250,7 +250,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract break; } - catch (TransactionOptimisticException e) { + catch (TransactionOptimisticException ignored) { // Retry. } } @@ -313,4 +313,4 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract assertEquals(total, grid(i).cache(null).get(key)); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java index 74b8659..f64216b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java @@ -21,7 +21,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheInterceptor; -import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.lang.IgniteBiTuple; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.java index 2c55381..c542bd6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.java @@ -108,7 +108,7 @@ public class GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest fail("Exception did not happened."); } - catch (BinaryInvalidTypeException e) { + catch (BinaryInvalidTypeException ignored) { // No-op. } } @@ -118,7 +118,7 @@ public class GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest fail("Exception did not happened."); } - catch (BinaryInvalidTypeException e) { + catch (BinaryInvalidTypeException ignored) { // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java index d068cad..fa17e58 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java @@ -23,8 +23,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.testframework.GridTestExternalClassLoader; import org.apache.ignite.testframework.config.GridTestProperties; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java index 6ba65ab..ab787a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java @@ -444,7 +444,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig try { sem.acquire(1); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedException ignored) { // Expected exception. return; } @@ -472,7 +472,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig try { sem2.acquire(); } - catch (Exception e){ + catch (Exception ignored){ failed = false; } finally { @@ -487,7 +487,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig while(!sem1.hasQueuedThreads()){ try { Thread.sleep(1); - } catch (InterruptedException e) { + } catch (InterruptedException ignored) { fail(); } } @@ -641,10 +641,10 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig fail("Exception must be thrown."); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { fail("Interrupted exception not expected here."); } - catch (IgniteException e) { + catch (IgniteException ignored) { isExceptionThrown = true; } finally { @@ -734,7 +734,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig final AtomicBoolean done = new AtomicBoolean(false); - IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() { + GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { try{ l.lock(); @@ -1344,8 +1344,8 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig try { barrier.await(); } - catch (BrokenBarrierException e) { - // Ignore. + catch (BrokenBarrierException ignored) { + // No-op. } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java index 8fb9049..388f167 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java @@ -500,7 +500,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe fail("Condition not associated with this lock passed as argument."); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ignored) { info("IllegalArgumentException thrown as it should be."); } @@ -511,7 +511,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe fail("This method should throw exception when lock is not held."); } - catch (IllegalMonitorStateException e) { + catch (IllegalMonitorStateException ignored) { info("IllegalMonitorStateException thrown as it should be."); } @@ -529,7 +529,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe fail("Condition not associated with this lock passed as argument."); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ignored) { info("IllegalArgumentException thrown as it should be."); } @@ -540,7 +540,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe fail("This method should throw exception when lock is not held."); } - catch (IllegalMonitorStateException e) { + catch (IllegalMonitorStateException ignored) { info("IllegalMonitorStateException thrown as it should be."); } @@ -604,7 +604,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe fail("This method should throw exception when lock is not held."); } - catch (IllegalMonitorStateException e) { + catch (IllegalMonitorStateException ignored) { info("IllegalMonitorStateException thrown as it should be."); } @@ -746,7 +746,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe try { lock0.lockInterruptibly(); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedException ignored) { assertFalse(Thread.currentThread().isInterrupted()); isInterrupted = true; @@ -842,7 +842,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe l.lockInterruptibly(); } - catch(IgniteInterruptedException e){ + catch(IgniteInterruptedException ignored){ exceptionThrown.set(true); } finally { @@ -946,7 +946,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe try { lock0.lock(); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedException ignored) { isInterrupted = true; fail("Lock() method is uninterruptible."); @@ -1031,7 +1031,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe try { locked = lock0.tryLock(); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedException ignored) { isInterrupted = true; fail("tryLock() method is uninterruptible."); @@ -1114,7 +1114,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe try { locked = lock0.tryLock(100, TimeUnit.MILLISECONDS); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedException ignored) { isInterrupted = true; } finally { @@ -1190,7 +1190,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe try { cond.awaitUninterruptibly(); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedException ignored) { isInterrupted = true; } finally { @@ -1279,7 +1279,7 @@ public abstract class IgniteLockAbstractSelfTest extends IgniteAtomicsAbstractTe try { cond.await(); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedException ignored) { isInterrupted = true; } finally { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java index c005945..38e2979 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java @@ -152,7 +152,7 @@ public class CacheGetFutureHangsSelfTest extends GridCommonAbstractTest { try { Thread.sleep(ThreadLocalRandom.current().nextLong(50)); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { Thread.currentThread().interrupt(); } } @@ -174,7 +174,7 @@ public class CacheGetFutureHangsSelfTest extends GridCommonAbstractTest { try { Thread.sleep(ThreadLocalRandom.current().nextLong(50)); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { Thread.currentThread().interrupt(); } } @@ -228,4 +228,4 @@ public class CacheGetFutureHangsSelfTest extends GridCommonAbstractTest { return null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java index 7e37450..70a6723 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java @@ -2207,7 +2207,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { if (partNodes.isEmpty()) { try { - ClusterNode primary = cacheAff.mapKeyToNode(i); + cacheAff.mapKeyToNode(i); fail(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java index 6a42752..e4b3e80 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java @@ -237,7 +237,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract try { fut.get(1, TimeUnit.SECONDS); } - catch (IgniteFutureTimeoutCheckedException e) { + catch (IgniteFutureTimeoutCheckedException ignored) { timeout = true; } @@ -268,4 +268,4 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract return true; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index b4ef11a..37e10b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@ -538,7 +538,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac client = false; - IgniteEx ignite3 = startGrid(3); + startGrid(3); log.info("Stop block."); @@ -671,7 +671,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac } }); - ignite3 = startGrid(3); + startGrid(3); log.info("Stop block2."); @@ -1098,7 +1098,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac } }); - ignite3 = startGrid(3); + startGrid(3); awaitPartitionMapExchange(); @@ -1208,7 +1208,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac client = false; - IgniteEx ignite3 = startGrid(3); + startGrid(3); log.info("Stop block."); @@ -1895,7 +1895,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac try { updateBarrier.await(30_000, TimeUnit.MILLISECONDS); } - catch (TimeoutException e) { + catch (TimeoutException ignored) { log.error("Failed to wait for update."); for (Ignite ignite : G.allGrids()) @@ -1935,7 +1935,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac try { updateBarrier.await(30_000, TimeUnit.MILLISECONDS); } - catch (TimeoutException e) { + catch (TimeoutException ignored) { log.error("Failed to wait for update."); for (Ignite ignite : G.allGrids()) http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java index 08396da..c6e7ac7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java @@ -262,8 +262,8 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri tx.commit(); } } - catch (CacheException | IgniteException e) { - // Ignore. + catch (CacheException | IgniteException ignored) { + // No-op. } } }); @@ -289,10 +289,10 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri break; } - catch (TransactionOptimisticException e) { + catch (TransactionOptimisticException ignored) { // Retry. } - catch (CacheException | IgniteException e) { + catch (CacheException | IgniteException ignored) { break; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java index 0294dea..3dfc4e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java @@ -348,7 +348,7 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest if (affFut != null) affFut.get(30_000); } - catch (IgniteFutureTimeoutCheckedException e) { + catch (IgniteFutureTimeoutCheckedException ignored) { log.error("Failed to wait for affinity future after start: " + topVer); failed = true; @@ -371,7 +371,7 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest if (affFut != null) affFut.get(30_000); } - catch (IgniteFutureTimeoutCheckedException e) { + catch (IgniteFutureTimeoutCheckedException ignored) { log.error("Failed to wait for affinity future after stop: " + topVer); failed = true; @@ -497,4 +497,4 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest return old; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java index b518a21..c3c6f8b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java @@ -441,7 +441,7 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest extends found = true; - IgniteCache<Integer, Integer> cache = ignite.cache(null); + ignite.cache(null); assertEquals("Unexpected value for: " + ignite.name(), key, key); } @@ -546,4 +546,4 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest extends } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java index 9bfde27..cc5f548 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java @@ -249,7 +249,7 @@ public class IgniteCachePutRetryTransactionalSelfTest extends IgniteCachePutRetr for (int i = 0; i < keysCnt; i++) cache.invoke(i, new SetEntryProcessor(val)); } - catch (Exception e) { + catch (Exception ignored) { // No-op. } } @@ -339,4 +339,4 @@ public class IgniteCachePutRetryTransactionalSelfTest extends IgniteCachePutRetr return null; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index 644e310..3fd4dd8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -392,7 +392,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA entry.unswap(); } - catch (GridDhtInvalidPartitionException e) { + catch (GridDhtInvalidPartitionException ignored) { // Skip key. } } @@ -481,4 +481,4 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA ((origMsg instanceof GridNearAtomicAbstractUpdateRequest) || (origMsg instanceof GridDhtAtomicAbstractUpdateRequest)); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/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 5fab800..73a5015 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 @@ -386,7 +386,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio else return true; } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignored) { // If e0.valueBytes() thrown this exception then entry has been removed. return true; } @@ -605,4 +605,4 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio assert !cache.isLocalLocked(key, false); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java index 7e3e7e5..f0e7ba5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.distributed.GridCacheAbstractNodeRestartSelfTest; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -131,4 +130,4 @@ public class GridCacheReplicatedNodeRestartSelfTest extends GridCacheAbstractNod @Override public void testRestartWithTxPutAllFourNodesTwoBackups() throws Throwable { super.testRestartWithTxPutAllFourNodesTwoBackups(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index c6cd5af..a976ca0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -60,7 +60,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; -import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheMode.REPLICATED; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index f22ca6d..01c0d72 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -1190,7 +1190,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs throws IgniteInterruptedCheckedException { GridTestUtils.waitForCondition(new PAX() { @Override public boolean applyx() throws IgniteCheckedException { - GridCacheEntryEx entry = null; + GridCacheEntryEx entry; while (true) { try { @@ -1270,4 +1270,4 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs return S.toString(TestPolicy.class, this); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java index d2cb710..ca0fbb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java @@ -998,7 +998,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC tx.commit(); } - catch (CacheException | ClusterTopologyException e) { + catch (CacheException | ClusterTopologyException ignored) { log.warning("Failed put. [Key=" + key + ", val=" + key + "]"); continue; @@ -1014,7 +1014,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC tx.commit(); } - catch (CacheException | ClusterTopologyException e) { + catch (CacheException | ClusterTopologyException ignored) { log.warning("Failed put. [Key=" + key + ", val=" + key + "]"); continue; @@ -2408,7 +2408,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC U.sleep(sleepTime); } - catch (IgniteInterruptedCheckedException e) { + catch (IgniteInterruptedCheckedException ignored) { Thread.interrupted(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java index dccde65..5a066fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java @@ -72,7 +72,7 @@ public class GridCacheContinuousQueryNodesFilteringTest extends GridCommonAbstra try (Ignite node2 = startGrid("node2", getConfiguration("node2", true, log))) { fail(); } - catch (IgniteException e) { + catch (IgniteException ignored) { assertTrue(log.toString().contains("Class not found for continuous query remote filter " + "[name=org.apache.ignite.tests.p2p.CacheDeploymentEntryEventFilter]")); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java index b1d8a49..89c374c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; -import javax.cache.Cache; import javax.cache.CacheException; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryListenerException; @@ -30,7 +29,6 @@ import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.query.ContinuousQuery; -import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -141,11 +139,11 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT putAndCheck(clCache, 0); // 0 remote listeners. - QueryCursor<Cache.Entry<Object, Object>> cur = (clientQuery ? clCache : cache1).query(qry); + (clientQuery ? clCache : cache1).query(qry); putAndCheck(clCache, 1); // 1 remote listener. - final Ignite srv2 = startGrid(2); + startGrid(2); putAndCheck(clCache, 2); // 2 remote listeners. @@ -169,7 +167,7 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT putAndCheck(clCache, 1); // 1 remote listener. - Ignite srv3 = startGrid(3); + startGrid(3); putAndCheck(clCache, 2); // 2 remote listeners. @@ -185,8 +183,8 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT putAndCheck(clCache, 2); // 2 remote listeners. - Ignite srv4 = startGrid(5); + startGrid(5); putAndCheck(clCache, 3); // 3 remote listeners. } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java index e9d74ff..6da9834 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java @@ -170,7 +170,7 @@ public class TxDeadlockDetectionNoHangsTest extends GridCommonAbstractTest { stopGrid(NODES_CNT); } - catch (Exception e) { + catch (Exception ignored) { // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java index 87bc70f..c060368 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java @@ -129,7 +129,7 @@ public class TxDeadlockDetectionTest extends GridCommonAbstractTest { stopGrid(NODES_CNT); } - catch (Exception e) { + catch (Exception ignored) { // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java index 691bc9f..4b3a0ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java @@ -73,7 +73,7 @@ public class GridComputeJobExecutionErrorToLogManualTest extends GridCommonAbstr try { Thread.sleep(500); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { // No-op. } } @@ -85,4 +85,4 @@ public class GridComputeJobExecutionErrorToLogManualTest extends GridCommonAbstr } }); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java index a6a9f54..9e4b28f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java @@ -179,7 +179,7 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest { try (IgniteDataStreamer<Integer, String> streamer = ignite.dataStreamer(null)) { streamer.addData(1, "1"); } - catch (CacheException ex) { + catch (CacheException ignored) { failed = true; } } @@ -212,13 +212,13 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest { streamer.flush(); } - catch (IllegalStateException ex) { + catch (IllegalStateException ignored) { try { fut.get(); fail("DataStreamer ignores failed streaming."); } - catch (CacheServerNotFoundException ignored) { + catch (CacheServerNotFoundException ignored2) { // No-op. } @@ -284,4 +284,4 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest { return obj instanceof TestObject && ((TestObject)obj).val == val; } } -} \ No newline at end of file +}
