You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/02/02 08:49:09 UTC

[11/24] ignite git commit: IGNITE-4612 Minor code cleanup

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerTimeoutTest.java
index 766aa84..410f196 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerTimeoutTest.java
@@ -94,7 +94,7 @@ public class DataStreamerTimeoutTest extends GridCommonAbstractTest {
             for (int i = 0; i < ENTRY_AMOUNT; i++)
                 ldr.addData(i, i);
         }
-        catch (CacheException | IgniteDataStreamerTimeoutException e) {
+        catch (CacheException | IgniteDataStreamerTimeoutException ignored) {
             thrown = true;
         }
         finally {
@@ -153,11 +153,11 @@ public class DataStreamerTimeoutTest extends GridCommonAbstractTest {
                         processed++;
                     }
                 }
-                catch (IllegalStateException e) {
+                catch (IllegalStateException ignored) {
                     // No-op.
                 }
             }
-            catch (CacheException | IgniteDataStreamerTimeoutException e) {
+            catch (CacheException | IgniteDataStreamerTimeoutException ignored) {
                 thrown = true;
             }
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index 128239d..c2d76df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -487,10 +487,10 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
         catch (IgfsParentNotDirectoryException ignore) {
             // No-op.
         }
-        catch (IgfsException ignore) {
+        catch (IgfsException e) {
             // Currently Ok for Hadoop fs:
             if (!getClass().getSimpleName().startsWith("Hadoop"))
-                throw ignore;
+                throw e;
         }
 
         try {
@@ -501,10 +501,10 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
         catch (IgfsParentNotDirectoryException ignore) {
             // No-op.
         }
-        catch (IgfsException ignore) {
+        catch (IgfsException e) {
             // Currently Ok for Hadoop fs:
             if (!getClass().getSimpleName().startsWith("Hadoop"))
-                throw ignore;
+                throw e;
         }
 
         create(igfs, paths(DIR, SUBDIR), null);
@@ -942,8 +942,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
             try (IgfsOutputStream os = igfs.create(new IgfsPath("/k/l"), false)) {}
 
             fail("Exception expected");
-        } catch (IgniteException e) {
-            // okay
+        } catch (IgniteException ignored) {
+            // No-op.
         }
 
         checkExist(igfs, igfsSecondary, new IgfsPath("/k/l"));
@@ -953,7 +953,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
             try (IgfsOutputStream os = igfs.create(new IgfsPath("/k/l/m"), true)) {}
 
             fail("Exception expected");
-        } catch (IgniteException e) {
+        } catch (IgniteException ignored) {
             // okay
         }
         checkNotExist(igfs, igfsSecondary, new IgfsPath("/k/l/m"));
@@ -964,7 +964,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
             try (IgfsOutputStream os = igfs.create(new IgfsPath("/k/l/m/n/o/p"), true)) {}
 
             fail("Exception expected");
-        } catch (IgniteException e) {
+        } catch (IgniteException ignored) {
             // okay
         }
         checkNotExist(igfs, igfsSecondary, new IgfsPath("/k/l/m"));
@@ -976,7 +976,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
             try (IgfsOutputStream os = igfs.create(new IgfsPath("/x/y"), true)) {}
 
             fail("Exception expected");
-        } catch (IgniteException e) {
+        } catch (IgniteException ignored) {
             // okay
         }
 
@@ -1337,7 +1337,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
 
                         createCtr.incrementAndGet();
                     }
-                    catch (IgniteException e) {
+                    catch (IgniteException ignored) {
                         // No-op.
                     }
                     catch (IOException e) {
@@ -1439,7 +1439,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
                 }
 
                 fail("Exception expected");
-            } catch (IgniteException e) {
+            } catch (IgniteException ignored) {
                 // okay
             }
             checkNotExist(igfs, igfsSecondary, new IgfsPath("/d1"));
@@ -1457,7 +1457,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
                 }
 
                 fail("Exception expected");
-            } catch (IgniteException e) {
+            } catch (IgniteException ignored) {
                 // okay
             }
             checkNotExist(igfs, igfsSecondary, new IgfsPath("/k/l/m"));
@@ -1471,7 +1471,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
                 }
 
                 fail("Exception expected");
-            } catch (IgniteException e) {
+            } catch (IgniteException ignored) {
                 // okay
             }
             checkNotExist(igfs, igfsSecondary, new IgfsPath("/k/l/m"));
@@ -1488,7 +1488,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
                 }
 
                 fail("Exception expected");
-            } catch (IgniteException e) {
+            } catch (IgniteException ignored) {
                 // okay
             }
 
@@ -1519,7 +1519,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
                 }
 
                 fail("Exception expected");
-            } catch (IgniteException e) {
+            } catch (IgniteException ignored) {
                 // okay
             }
             checkNotExist(igfs, igfsSecondary, new IgfsPath("/d1"));
@@ -2549,4 +2549,4 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
 
         U.joinThreads(threads, 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/igfs/IgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
index 486179c..b2b87dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
@@ -43,8 +43,6 @@ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest {
     public void testSerialization() throws Exception {
         marshaller.setContext(new MarshallerContextTestImpl());
 
-        final int max = Integer.MAX_VALUE;
-
         multithreaded(new Callable<Object>() {
             private final Random rnd = new Random();
 
@@ -77,4 +75,4 @@ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest {
     private <T> T mu(T obj) throws IgniteCheckedException {
         return marshaller.unmarshal(marshaller.marshal(obj), 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/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index a4100ea..01e1a2e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -158,7 +158,6 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
         for (IgniteBiTuple<IgniteUuid, String> tup: Arrays.asList(F.t(dir.id(), "dir"), F.t(file.id(), "file"))) {
             IgniteUuid fileId = tup.get1();
-            String fileName = tup.get2();
 
             for (Map<String, String> props : Arrays.asList(null, Collections.<String, String>emptyMap()))
                 expectsUpdatePropertiesFail(fileId, props, AssertionError.class, "Expects not-empty file's properties");
@@ -419,4 +418,4 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
         assertTrue("Unexpected cause: " + err, err instanceof IgfsException);
     }
-}
\ 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/igfs/IgfsModeResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolverSelfTest.java
index 7932660..2b231cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolverSelfTest.java
@@ -98,8 +98,8 @@ public class IgfsModeResolverSelfTest extends TestCase {
 
             fail("IgniteCheckedException expected");
         }
-        catch (IgniteCheckedException ice) {
-            // Expected.
+        catch (IgniteCheckedException ignored) {
+            // No-op.
         }
 
         // PRIMARY default mode and non-primary subfolder:
@@ -111,8 +111,8 @@ public class IgfsModeResolverSelfTest extends TestCase {
 
                     fail("IgniteCheckedException expected");
                 }
-                catch (IgniteCheckedException ice) {
-                    // Expected.
+                catch (IgniteCheckedException ignored) {
+                    // No-op.
                 }
             }
         }
@@ -178,4 +178,4 @@ public class IgfsModeResolverSelfTest extends TestCase {
             add(new IgfsPath("/a/b/x/y"));
         }});
     }
-}
\ 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/igfs/benchmark/IgfsBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/benchmark/IgfsBenchmark.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/benchmark/IgfsBenchmark.java
index 9cf6e8f..f3bce8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/benchmark/IgfsBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/benchmark/IgfsBenchmark.java
@@ -96,7 +96,7 @@ class WriteFileOperation extends FileOperation {
     /** {@inheritDoc} */
     @Override public void handleFile(String strPath) throws Exception {
         IgfsPath path = new IgfsPath(strPath);
-        IgfsOutputStream out = null;
+        IgfsOutputStream out;
 
         try {
             out = fs.create(path, false);
@@ -154,7 +154,7 @@ class ReadFileOperation extends FileOperation {
     /** {@inheritDoc} */
     @Override public void handleFile(String strPath) throws Exception {
         IgfsPath path = new IgfsPath(strPath);
-        IgfsInputStream in = null;
+        IgfsInputStream in;
 
         try {
             in = fs.open(path);

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index eadf674..c26376e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -38,7 +38,6 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
 import org.apache.ignite.internal.processors.rest.GridRestCommand;
-import org.apache.ignite.internal.processors.rest.GridRestResponse;
 import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
 import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest;
 import org.apache.ignite.internal.util.future.GridFinishedFuture;

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
index 811594f..156a72e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
@@ -45,7 +45,7 @@ public class GridServiceDeploymentExceptionPropagationTest extends GridCommonAbs
                 try {
                     client.services().deployClusterSingleton("my-service", new ServiceImpl());
                 }
-                catch (IgniteException e) {
+                catch (IgniteException ignored) {
                     assertTrue(log.toString().contains("ServiceImpl init exception"));
 
                     return; // Exception is what we expect.

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
index 92b18ab..08595f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
@@ -65,7 +65,7 @@ public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
                 try {
                     services.future().get();
                 }
-                catch (IgniteException e) {
+                catch (IgniteException ignored) {
                     finishLatch.countDown();
                 }
                 finally {

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java
index d7937ec..09c631c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java
@@ -176,7 +176,7 @@ public class IgniteServiceReassignmentTest extends GridCommonAbstractTest {
 
                     return true;
                 }
-                catch (IgniteException e) {
+                catch (IgniteException ignored) {
                     return false;
                 }
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
index d774065..c068984 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
@@ -54,7 +54,6 @@ import org.apache.ignite.lang.IgniteBiTuple;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.http.GridEmbeddedHttpServer;
-import org.apache.ignite.testframework.junits.GridTestKernalContext;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
 import org.jetbrains.annotations.Nullable;
@@ -325,7 +324,7 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest {
 
             col = Arrays.asList(this, this, this);
 
-            GridTestKernalContext ctx = newContext();
+            newContext();
 
             subGrid = ignite.cluster().forNodes(Collections.singleton(node));
         }
@@ -780,4 +779,4 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest {
     private interface I3 extends I2 {}
     @Ann2 private interface I4 {}
     private interface I5 extends I4 {}
-}
\ 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/util/offheap/unsafe/GridOffheapSnapTreeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffheapSnapTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffheapSnapTreeSelfTest.java
index 92d9ec2..0d97d54 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffheapSnapTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffheapSnapTreeSelfTest.java
@@ -72,7 +72,10 @@ public class GridOffheapSnapTreeSelfTest extends GridCommonAbstractTest {
                         guard.begin();
 
                         try {
-                            GridOffHeapSmartPointer res = put ? m.put(fx, fx) : m.remove(fx);
+                            if (put)
+                                m.put(fx, fx);
+                            else
+                                m.remove(fx);
                         }
                         finally {
                             lock.readLock().unlock();
@@ -320,4 +323,4 @@ public class GridOffheapSnapTreeSelfTest extends GridCommonAbstractTest {
             return ptr + "(" + refs + ")";
         }
     }
-}
\ 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/lang/GridMetadataAwareAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java
index a0a926a..f202fa9 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java
@@ -51,7 +51,7 @@ public class GridMetadataAwareAdapterSelfTest extends GridCommonAbstractTest {
         int k3 = cnt++;
         int a1 = cnt++;
         int a2 = cnt++;
-        int a3 = cnt++;
+        int a3 = cnt;
 
         // addMeta(name, val).
         assert ma.addMeta(attr1, "val1") == null;
@@ -139,4 +139,4 @@ public class GridMetadataAwareAdapterSelfTest extends GridCommonAbstractTest {
 
         assert !ma.hasMeta(a3);
     }
-}
\ 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/p2p/GridP2PSameClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java
index ba5e15b..9ac4852 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java
@@ -82,12 +82,10 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest {
 
     /**
      * Test.
-     * @param isIsolatedDifferentTask Isolated different task flag.
-     * @param isIsolatedDifferentNode Isolated different mode flag.
      * @throws Exception if error occur
      */
     @SuppressWarnings({"unchecked"})
-    private void processTest(boolean isIsolatedDifferentTask, boolean isIsolatedDifferentNode) throws Exception {
+    private void processTest() throws Exception {
         try {
             final Ignite ignite1 = startGrid(1);
             Ignite ignite2 = startGrid(2);
@@ -128,7 +126,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest {
     public void testPrivateMode() throws Exception {
         depMode = DeploymentMode.PRIVATE;
 
-        processTest(true, true);
+        processTest();
     }
 
     /**
@@ -139,7 +137,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest {
     public void testIsolatedMode() throws Exception {
         depMode = DeploymentMode.ISOLATED;
 
-        processTest(false, true);
+        processTest();
     }
 
     /**
@@ -150,7 +148,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest {
     public void testContinuousMode() throws Exception {
         depMode = DeploymentMode.CONTINUOUS;
 
-        processTest(false, false);
+        processTest();
     }
 
     /**
@@ -161,7 +159,7 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest {
     public void testSharedMode() throws Exception {
         depMode = DeploymentMode.SHARED;
 
-        processTest(false, false);
+        processTest();
     }
 
     /**
@@ -177,4 +175,4 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest {
 
         return m1[0] != m2[0] && m1[1] != m2[1];
     }
-}
\ 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/platform/PlatformEventsWriteEventTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java
index 9fbe272..2e5a3e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java
@@ -23,15 +23,6 @@ import org.apache.ignite.compute.ComputeJob;
 import org.apache.ignite.compute.ComputeJobAdapter;
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.compute.ComputeTaskAdapter;
-import org.apache.ignite.events.CacheEvent;
-import org.apache.ignite.events.CacheQueryExecutedEvent;
-import org.apache.ignite.events.CacheQueryReadEvent;
-import org.apache.ignite.events.CacheRebalancingEvent;
-import org.apache.ignite.events.CheckpointEvent;
-import org.apache.ignite.events.DiscoveryEvent;
-import org.apache.ignite.events.JobEvent;
-import org.apache.ignite.events.SwapSpaceEvent;
-import org.apache.ignite.events.TaskEvent;
 import org.apache.ignite.internal.binary.BinaryRawWriterEx;
 import org.apache.ignite.internal.processors.platform.PlatformContext;
 import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java
index 9a1c9a0..1483364 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java
@@ -128,7 +128,7 @@ public class GridLocalDeploymentSpiSelfTest extends GridSpiAbstractTest<LocalDep
 
             assert false : "Exception must be thrown for registering with the same name.";
         }
-        catch (IgniteSpiException e) {
+        catch (IgniteSpiException ignored) {
             // No-op.
         }
 
@@ -147,7 +147,7 @@ public class GridLocalDeploymentSpiSelfTest extends GridSpiAbstractTest<LocalDep
 
             assert false : "Exception must be thrown for registering with the same name.";
         }
-        catch (IgniteSpiException e) {
+        catch (IgniteSpiException ignored) {
             // No-op.
         }
 
@@ -192,4 +192,4 @@ public class GridLocalDeploymentSpiSelfTest extends GridSpiAbstractTest<LocalDep
             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/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
index 35aa934..a0545f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
@@ -313,8 +313,8 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
                     try {
                         Thread.sleep(2000);
                     }
-                    catch (InterruptedException e) {
-                        // Ignore
+                    catch (InterruptedException ignored) {
+                        // No-op.
                     }
 
                     throw new SocketTimeoutException("Forced timeout");

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 043208c..fc40f13 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -1327,7 +1327,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
 
                 nodeSpi.set(new TestCustomEventRaceSpi());
 
-                Ignite ignite2 = startGrid(2);
+                startGrid(2);
 
                 return null;
             }
@@ -2040,7 +2040,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
 
                     return false;
                 }
-                catch (IgniteIllegalStateException e) {
+                catch (IgniteIllegalStateException ignored) {
                     return true;
                 }
             }
@@ -2406,8 +2406,8 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
                     try {
                         Thread.sleep(5_000);
                     }
-                    catch (InterruptedException e) {
-                        // Ignore.
+                    catch (InterruptedException ignored) {
+                        // No-op.
                     }
                 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
index 4ef984f..a496f30 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
@@ -323,14 +323,14 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
                 try {
                     Thread.sleep(timeout + 1000);
                 }
-                catch (InterruptedException e) {
-                    // Ignore
+                catch (InterruptedException ignored) {
+                    // No-op.
                 }
 
                 try {
                     timeoutHelper.nextTimeoutChunk(0);
                 }
-                catch (IgniteSpiOperationTimeoutException e) {
+                catch (IgniteSpiOperationTimeoutException ignored) {
                     throw (err = new IgniteSpiOperationTimeoutException("Timeout: openSocketTimeoutWait"));
                 }
             }
@@ -340,8 +340,8 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
             try {
                 Thread.sleep(1500);
             }
-            catch (InterruptedException e) {
-                // Ignore
+            catch (InterruptedException ignored) {
+                // No-op.
             }
 
             return sock;
@@ -369,8 +369,8 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
                 try {
                     Thread.sleep(timeout);
                 }
-                catch (InterruptedException e) {
-                    // Ignore
+                catch (InterruptedException ignored) {
+                    // No-op.
                 }
             }
             else

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
index 9e927dd..e573afc 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
@@ -30,7 +30,6 @@ import org.apache.ignite.internal.util.typedef.CI1;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.P1;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteInClosure;
 import org.apache.ignite.spi.IgniteSpiCloseableIterator;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -650,4 +649,4 @@ public abstract class GridSwapSpaceSpiAbstractSelfTest extends GridCommonAbstrac
             return "Key: " + i;
         }
     }
-}
\ 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/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
index ac50ef9..b19d07b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
@@ -665,10 +665,9 @@ public class GridSpiTestContext implements IgniteSpiContext {
         @Override public void onMessage(UUID nodeId, Object msg) {
             GridIoUserMessage ioMsg = (GridIoUserMessage)msg;
 
-            ClusterNode node = locNode;
-                Object msgBody = ioMsg.body();
+            Object msgBody = ioMsg.body();
 
-                assert msgBody != null || ioMsg.bodyBytes() != null;
+            assert msgBody != null || ioMsg.bodyBytes() != null;
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
index 157e1f5..861c139 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java
@@ -130,7 +130,7 @@ public class IgniteTestSuite extends TestSuite {
         try {
             getTestConstructor(theClass);
         }
-        catch (NoSuchMethodException ex) {
+        catch (NoSuchMethodException ignored) {
             addTest(warning("Class " + theClass.getName() +
                 " has no public constructor TestCase(String name) or TestCase()"));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index d14aa4e..980d550 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDa
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDiscoveryDataStructuresTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureUniqueNameTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureWithJobTest;
-import org.apache.ignite.internal.processors.cache.datastructures.SemaphoreFailoverSafeReleasePermitsTest;
 import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicOffheapSetSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicQueueApiSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicSetSelfTest;
@@ -69,7 +68,6 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedAtomicLongApiSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedCountDownLatchSelfTest;
-import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedLockSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSemaphoreSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest;

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java
index 6933ae9..bfb9cd1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMessagingConfigVariationFullApiTestSuite.java
@@ -27,8 +27,6 @@ import org.apache.ignite.testframework.configvariations.ConfigVariations;
 import org.apache.ignite.testframework.configvariations.ConfigVariationsTestSuiteBuilder;
 import org.apache.ignite.testframework.configvariations.Parameters;
 
-import javax.cache.configuration.Factory;
-
 /**
  * Test sute for Messaging process.
  */
@@ -69,4 +67,4 @@ public class IgniteMessagingConfigVariationFullApiTestSuite extends TestSuite {
 
         return suite;
     }
-}
\ 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/util/mbeans/GridMBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
index 58be549..4f5ed19 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
@@ -90,7 +90,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest {
 
             mbean.getMBeanInfo();
         }
-        catch (AssertionError e) {
+        catch (AssertionError ignored) {
             return;
         }
 
@@ -109,7 +109,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest {
 
             mbean.getMBeanInfo();
         }
-        catch (AssertionError e) {
+        catch (AssertionError ignored) {
             return;
         }
 
@@ -128,7 +128,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest {
 
             mbean.getMBeanInfo();
         }
-        catch (AssertionError e) {
+        catch (AssertionError ignored) {
             return;
         }
 
@@ -147,7 +147,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest {
 
             mbean.getMBeanInfo();
         }
-        catch (AssertionError e) {
+        catch (AssertionError ignored) {
             return;
         }
 
@@ -371,4 +371,4 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest {
             return null;
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java
index 5c82469..bbf8abf 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java
@@ -22,7 +22,6 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 
@@ -84,4 +83,4 @@ public class CacheNoValueClassOnServerTestClient {
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
index e0406c2..9798025 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/startcache/CacheConfigurationP2PTestClient.java
@@ -24,7 +24,6 @@ import org.apache.ignite.Ignition;
 import org.apache.ignite.cache.query.SqlQuery;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 
@@ -114,4 +113,4 @@ public class CacheConfigurationP2PTestClient {
             cache2.destroy();
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java b/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java
index 980c696..71074c0 100644
--- a/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java
+++ b/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java
@@ -379,7 +379,7 @@ public class TcpDiscoveryGoogleStorageIpFinder extends TcpDiscoveryIpFinderAdapt
         try {
             port = Integer.parseInt(res[1]);
         }
-        catch (NumberFormatException e) {
+        catch (NumberFormatException ignored) {
             throw new IgniteSpiException("Invalid port number: " + res[1]);
         }
 
@@ -403,4 +403,4 @@ public class TcpDiscoveryGoogleStorageIpFinder extends TcpDiscoveryIpFinderAdapt
             throw new IgniteSpiException("Failed to remove the bucket: " + bucketName, e);
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
index a44e1ae..23db921 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
@@ -158,7 +158,7 @@ public class HadoopIgfsEndpoint {
                 if (port < 0 || port > 65535)
                     throw new IgniteCheckedException("Invalid port number: " + connStr);
             }
-            catch (NumberFormatException e) {
+            catch (NumberFormatException ignored) {
                 throw new IgniteCheckedException("Invalid port number: " + connStr);
             }
         }
@@ -207,4 +207,4 @@ public class HadoopIgfsEndpoint {
     @Override public String toString() {
         return S.toString(HadoopIgfsEndpoint.class, this);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopBasicFileSystemFactoryDelegate.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopBasicFileSystemFactoryDelegate.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopBasicFileSystemFactoryDelegate.java
index 59488be..2db0271 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopBasicFileSystemFactoryDelegate.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopBasicFileSystemFactoryDelegate.java
@@ -154,7 +154,7 @@ public class HadoopBasicFileSystemFactoryDelegate implements HadoopFileSystemFac
             try {
                 fullUri = new URI(proxy0.getUri());
             }
-            catch (URISyntaxException use) {
+            catch (URISyntaxException ignored) {
                 throw new IgniteException("Failed to resolve secondary file system URI: " + proxy0.getUri());
             }
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
index 8bdcc83..f9f98ed 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
@@ -117,7 +117,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to get file info because Grid is stopping: " + path);
         }
     }
@@ -134,7 +134,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to update file because Grid is stopping: " + path);
         }
     }
@@ -155,9 +155,8 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
-            throw new HadoopIgfsCommunicationException("Failed to set path times because Grid is stopping: " +
-                path);
+        catch (IllegalStateException ignored) {
+            throw new HadoopIgfsCommunicationException("Failed to set path times because Grid is stopping: " + path);
         }
     }
 
@@ -177,7 +176,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to rename path because Grid is stopping: " + src);
         }
     }
@@ -194,7 +193,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to delete path because Grid is stopping: " + path);
         }
     }
@@ -208,14 +207,13 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
                 }
             });
         }
-        catch (IllegalStateException e) {
-            throw new HadoopIgfsCommunicationException("Failed to get file system status because Grid is " +
-                "stopping.");
+        catch (IllegalStateException ignored) {
+            throw new HadoopIgfsCommunicationException("Failed to get file system status because Grid is stopping.");
         }
         catch (IgniteCheckedException | RuntimeException | Error e) {
             throw e;
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             throw new AssertionError("Must never go there.");
         }
     }
@@ -232,7 +230,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to list paths because Grid is stopping: " + path);
         }
     }
@@ -249,7 +247,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to list files because Grid is stopping: " + path);
         }
     }
@@ -270,7 +268,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to create directory because Grid is stopping: " +
                 path);
         }
@@ -288,7 +286,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to get content summary because Grid is stopping: " +
                 path);
         }
@@ -307,7 +305,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to get affinity because Grid is stopping: " + path);
         }
     }
@@ -326,7 +324,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to open file because Grid is stopping: " + path);
         }
     }
@@ -346,7 +344,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to open file because Grid is stopping: " + path);
         }
     }
@@ -367,7 +365,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to create file because Grid is stopping: " + path);
         }
     }
@@ -387,7 +385,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
         catch (IgniteException e) {
             throw new IgniteCheckedException(e);
         }
-        catch (IllegalStateException e) {
+        catch (IllegalStateException ignored) {
             throw new HadoopIgfsCommunicationException("Failed to append file because Grid is stopping: " + path);
         }
     }
@@ -508,4 +506,4 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
     @Override public String user() {
         return user;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Context.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Context.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Context.java
index 1f4e675..6202622 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Context.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Context.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.mapreduce.task.JobContextImpl;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.processors.hadoop.HadoopFileBlock;
 import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit;
-import org.apache.ignite.internal.processors.hadoop.HadoopMapperAwareTaskOutput;
 import org.apache.ignite.internal.processors.hadoop.HadoopTaskCancelledException;
 import org.apache.ignite.internal.processors.hadoop.HadoopTaskContext;
 import org.apache.ignite.internal.processors.hadoop.HadoopTaskInput;
@@ -242,4 +241,4 @@ public class HadoopV2Context extends JobContextImpl implements MapContext, Reduc
     public void cancel() {
         cancelled = true;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
index 993ecc9..a5f3df9 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
@@ -130,7 +130,7 @@ public class HadoopExecutorService {
                     return; // Rejected due to shutdown.
             }
         }
-        catch (InterruptedException e) {
+        catch (InterruptedException ignored) {
             Thread.currentThread().interrupt();
 
             return;
@@ -217,7 +217,7 @@ public class HadoopExecutorService {
 
                 awaitTimeMillis -= 100;
             }
-            catch (InterruptedException e) {
+            catch (InterruptedException ignored) {
                 break;
             }
         }
@@ -231,4 +231,4 @@ public class HadoopExecutorService {
     public boolean isShutdown() {
         return shutdown;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
index 3336120..0f418e7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
@@ -153,7 +153,7 @@ public class HadoopChildProcessRunner {
                 shuffleJob = new HadoopShuffleJob<>(comm.localProcessDescriptor(), log, job, mem,
                     req.totalReducerCount(), req.localReducers(), 0, false);
 
-                initializeExecutors(req);
+                initializeExecutors();
 
                 if (log.isDebugEnabled())
                     log.debug("External process initialized [initWaitTime=" +
@@ -233,13 +233,9 @@ public class HadoopChildProcessRunner {
     /**
      * Creates executor services.
      *
-     * @param req Init child process request.
      */
-    private void initializeExecutors(HadoopPrepareForJobRequest req) {
+    private void initializeExecutors() {
         int cpus = Runtime.getRuntime().availableProcessors();
-//
-//        concMappers = get(req.jobInfo(), EXTERNAL_CONCURRENT_MAPPERS, cpus);
-//        concReducers = get(req.jobInfo(), EXTERNAL_CONCURRENT_REDUCERS, cpus);
 
         execSvc = new HadoopExecutorService(log, "", cpus * 2, 1024);
     }
@@ -466,4 +462,4 @@ public class HadoopChildProcessRunner {
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopErrorSimulator.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopErrorSimulator.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopErrorSimulator.java
index b89dcc1..7c76cc3 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopErrorSimulator.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopErrorSimulator.java
@@ -208,8 +208,8 @@ public class HadoopErrorSimulator {
                 if ((bits & 1) != 0)
                     simulateError();
             }
-            catch (IOException e) {
-                // ignore
+            catch (IOException ignored) {
+                // No-op.
             }
         }
 
@@ -237,8 +237,8 @@ public class HadoopErrorSimulator {
                 if ((bits & 16) != 0)
                     simulateError();
             }
-            catch (IOException e) {
-                // ignore
+            catch (IOException ignored) {
+                // No-op.
             }
         }
 
@@ -266,8 +266,8 @@ public class HadoopErrorSimulator {
                 if ((bits & 256) != 0)
                     simulateError();
             }
-            catch (IOException e) {
-                // ignore
+            catch (IOException ignored) {
+                // No-op.
             }
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
index d8f6f54..a297aef 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
@@ -66,7 +66,6 @@ import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
 import org.apache.ignite.igfs.IgfsMetrics;
 import org.apache.ignite.igfs.IgfsMode;
 import org.apache.ignite.igfs.IgfsPath;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsUtils;
 import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest;
 import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.typedef.F;
@@ -2044,4 +2043,4 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
                 pathUri.getAuthority() != null ? secondaryUri.getAuthority() : null, pathUri.getPath(), null, null));
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
index 555da1e..ed806db 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
@@ -33,10 +33,6 @@ import org.apache.ignite.igfs.IgfsIpcEndpointType;
 import org.apache.ignite.igfs.IgfsPath;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.igfs.common.IgfsLogger;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfs;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsOutProc;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsOutputStream;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsStreamDelegate;
 import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest;
 import org.apache.ignite.internal.processors.igfs.IgfsContext;
 import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
@@ -213,4 +209,4 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest
 
         return (T)field.get(obj);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridH2ResultSetIterator.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridH2ResultSetIterator.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridH2ResultSetIterator.java
index c8c26c4..fed292a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridH2ResultSetIterator.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/GridH2ResultSetIterator.java
@@ -22,7 +22,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.NoSuchElementException;
 import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.query.IgniteSQLException;
 import org.apache.ignite.internal.processors.query.h2.opt.GridH2ValueCacheObject;
@@ -189,4 +188,4 @@ public abstract class GridH2ResultSetIterator<T> extends GridCloseableIteratorAd
     @Override public String toString() {
         return S.toString(GridH2ResultSetIterator.class, this);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 9037943..cf044e2 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1232,7 +1232,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
                             try {
                                 ctx.cache().createMissingCaches();
                             }
-                            catch (IgniteCheckedException e1) {
+                            catch (IgniteCheckedException ignored) {
                                 throw new CacheException("Failed to create missing caches.", e);
                             }
 
@@ -3151,4 +3151,4 @@ public class IgniteH2Indexing implements GridQueryIndexing {
         for (Connection conn : conns)
             U.close(conn, log);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
index c29239f..3820cdc 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
@@ -1228,7 +1228,7 @@ public abstract class GridH2IndexBase extends BaseIndex {
                 try {
                     res = respQueue.poll(500, TimeUnit.MILLISECONDS);
                 }
-                catch (InterruptedException e) {
+                catch (InterruptedException ignored) {
                     throw new GridH2RetryException("Interrupted.");
                 }
 
@@ -1535,4 +1535,4 @@ public abstract class GridH2IndexBase extends BaseIndex {
             return fltr.apply(key, val);
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/DmlAstUtils.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/DmlAstUtils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/DmlAstUtils.java
index 6deb146..9752c5f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/DmlAstUtils.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/DmlAstUtils.java
@@ -382,7 +382,7 @@ public final class DmlAstUtils {
         try {
             dfltVal = dfltExpr != null ? dfltExpr.getValue(null) : null;
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             throw new IgniteSQLException("Failed to evaluate default value for a column " + col.columnName());
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
index 0d118b4..88aba55 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
@@ -41,7 +41,7 @@ public class GridH2Geometry extends GridH2ValueMessage {
         try {
             GEOMETRY_FROM_BYTES = Class.forName("org.h2.value.ValueGeometry").getMethod("get", byte[].class);
         }
-        catch (NoSuchMethodException | ClassNotFoundException e) {
+        catch (NoSuchMethodException | ClassNotFoundException ignored) {
             throw new IllegalStateException("Check H2 version in classpath.");
         }
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
index 669c482..d205065 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java
@@ -31,7 +31,6 @@ import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.cache.CacheRebalanceMode;
 import org.apache.ignite.cache.CacheTypeMetadata;
 import org.apache.ignite.cache.CacheWriteSynchronizationMode;
-import org.apache.ignite.cache.query.QueryCursor;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
 import org.apache.ignite.cache.query.SqlQuery;
 import org.apache.ignite.configuration.BinaryConfiguration;
@@ -56,7 +55,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Test for query with BinaryMarshaller and different serialization modes.

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index dc0175d..c1e94f0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -227,7 +227,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
                     ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
                     while (U.currentTimeMillis() < stopTime)
-                        randomOperation(rnd, ignite, cache, indexing);
+                        randomOperation(rnd, cache, indexing);
                 }
             }, 1, "test-thread");
         }
@@ -238,12 +238,10 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
 
     /**
      * @param rnd Random generator.
-     * @param ignite Node.
      * @param cache Cache.
      * @param indexing Indexing flag.
      */
     private void randomOperation(ThreadLocalRandom rnd,
-        Ignite ignite,
         IgniteCache<Object, Object> cache,
         boolean indexing) {
         int r0 = rnd.nextInt(100);

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
index b31447c..ec94b0c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
@@ -113,7 +113,7 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe
     /** */
     public void testReconnectClient() throws Exception {
         try {
-            Ignite igniteSrv = startGrid(0);
+            startGrid(0);
 
             Ignite client = startGrid(1);
 
@@ -159,7 +159,7 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe
 
             Thread.sleep(2_000);
 
-            igniteSrv = startGrid(0);
+            startGrid(0);
 
             Thread.sleep(2_000);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java
index b3aedfc..3b1cf11 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java
@@ -80,7 +80,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
         catch (CacheException e) {
             X.println("Caught expected exception: " + e);
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             assert false;
         }
     }
@@ -99,7 +99,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
         catch (CacheException e) {
             X.println("Caught expected exception: " + e);
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             assert false;
         }
 
@@ -111,7 +111,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
         catch (CacheException e) {
             X.println("Caught expected exception: " + e);
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             assert false;
         }
     }
@@ -130,7 +130,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
         catch (CacheException e) {
             X.println("Caught expected exception: " + e);
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             assert false;
         }
     }
@@ -148,7 +148,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
                 }
             }).setLocal(true)).getAll();
         }
-        catch (IgniteException e) {
+        catch (IgniteException ignored) {
             assertTrue("Scan query should work with disable query indexing.", false);
         }
     }
@@ -166,7 +166,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
         catch (CacheException e) {
             X.println("Caught expected exception: " + e);
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             assert false;
         }
     }
@@ -185,7 +185,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
         catch (CacheException e) {
             X.println("Caught expected exception: " + e);
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             assert false;
         }
     }
@@ -204,7 +204,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
         catch (CacheException e) {
             X.println("Caught expected exception: " + e);
         }
-        catch (Exception e) {
+        catch (Exception ignored) {
             assert false;
         }
     }
@@ -222,7 +222,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
                 }
             })).getAll();
         }
-        catch (IgniteException e) {
+        catch (IgniteException ignored) {
             assertTrue("Scan query should work with disabled query indexing.", false);
         }
     }
@@ -258,4 +258,4 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest
             return S.toString(SqlValue.class, this);
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 7c5b472..ddffb68 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -66,7 +66,6 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.events.CacheQueryExecutedEvent;
 import org.apache.ignite.events.CacheQueryReadEvent;
 import org.apache.ignite.events.Event;
-import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQuerySelfTest;
 import org.apache.ignite.internal.processors.cache.query.QueryCursorEx;
@@ -252,7 +251,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
 
             fail();
         }
-        catch (CacheException e) {
+        catch (CacheException ignored) {
             // No-op.
         }
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
index 1f992e4..69ef79d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
@@ -35,7 +35,6 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;

http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
index fb90c7e..88eedaf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
@@ -18,8 +18,6 @@
 package org.apache.ignite.internal.processors.cache;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.ignite.IgniteCache;
@@ -270,13 +268,10 @@ public class IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest extends Igni
         @Override public void run() {
             log.info("Begin run " + keyBegin);
             IgniteCache cache = ignite.cache(cacheName);
-            Map<Integer, Integer> vals = new HashMap<>();
 
             for (int i = 0; i < KEYS_CNT; ++i)
                 cache.put(i + keyBegin, i + keyBegin);
-//                vals.put(i + keyBegin, i + keyBegin);
 
-//            cache.putAll(vals);
             log.info("End run " + keyBegin);
         }
     }
@@ -315,15 +310,11 @@ public class IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest extends Igni
         @Override public void run() {
             log.info("Begin run " + keyBegin);
             IgniteCache cache = ignite.cache(Person.class.getSimpleName());
-            Map<Person.Key, Person> pers = new HashMap<>();
 
             for (int i = 0; i < KEYS_CNT; ++i) {
                 Person p = new Person(i + keyBegin, orgId);
-//                pers.put(p.createKey(), p);
                 cache.put(p.createKey(), p);
             }
-
-//            cache.putAll(pers);
         }
     }
-}
\ No newline at end of file
+}