IGNITE-15467 Adds code style JavaDoc rule for maven checkstyle plugin. (#9383)

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 87b156c..869689b 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -134,6 +134,55 @@
             See: https://checkstyle.sourceforge.io/config_whitespace.html#GenericWhitespace
         -->
         <module name="GenericWhitespace"/>
+
+        <!--
+           Checks for missing Javadoc comments for a method or constructor arguments.
+           See: https://checkstyle.sourceforge.io/config_javadoc.html#MissingJavadocMethod
+        -->
+        <module name="MissingJavadocMethod">
+            <property name="scope" value="private"/>
+            <property name="allowedAnnotations" value="{}"/>
+        </module>
+
+        <!--
+           Checks presence of a Javadoc for a method or constructor.
+           See: https://checkstyle.sourceforge.io/config_javadoc.html#JavadocMethod
+        -->
+        <module name="JavadocMethod">
+            <property name="accessModifiers" value="public"/>
+        </module>
+
+        <!--
+           Checks for missing Javadoc comments for class, enum, interface, and annotation interface definitions.
+           See: https://checkstyle.sourceforge.io/config_javadoc.html#MissingJavadocType
+        -->
+        <module name="MissingJavadocType">
+            <property name="scope" value="private"/>
+        </module>
+
+        <!--
+           Checks that a variable has a Javadoc comment. Ignores serialVersionUID fields.
+           See: https://checkstyle.sourceforge.io/config_javadoc.html#JavadocVariable
+        -->
+        <module name="JavadocVariable"/>
+
+        <!--
+          Suppresses MissingJavadocMethod check violations in the specified packages.
+          See: https://checkstyle.sourceforge.io/config_filters.html#SuppressionXpathSingleFilter
+       -->
+        <module name="SuppressionXpathSingleFilter">
+            <property name="checks" value="(?&lt;!Missing)JavadocMethod"/>
+            <property name="files" value="[\\/]internal[\\/]|[\\/]test[\\/]|[\\/]tests[\\/]|[\\/]ml[\\/]|[\\/]yardstick[\\/]"/>
+        </module>
+
+        <!--
+          Suppresses all Javadoc check violations in the specified files.
+          See: https://checkstyle.sourceforge.io/config_filters.html#SuppressionXpathSingleFilter
+       -->
+        <module name="SuppressionXpathSingleFilter">
+            <property name="checks" value="Javadoc"/>
+            <property name="files" value="BCrypt\.java|HLL\.java|HLLMetadata\.java|HLLType\.java|BigEndianAscendingWordSerializer\.java|NumberUtil\.java|SchemaVersionOne\.java|BigEndianAscendingWordDeserializer\.java|CacheView\.java|ConcurrentLinkedDeque8\.java|ConcurrentHashMap8\.java|ConcurrentLinkedHashMap\.java"/>
+        </module>
     </module>
 
     <!--
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index 2736f2c..f56e087 100644
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -95,8 +95,10 @@
     /** Caches' names. */
     private static final String USER_CACHE_NAME = "org.apache.ignite.examples.datagrid.hibernate.User";
 
+    /** */
     private static final String USER_POSTS_CACHE_NAME = "org.apache.ignite.examples.datagrid.hibernate.User.posts";
 
+    /** */
     private static final String POST_CACHE_NAME = "org.apache.ignite.examples.datagrid.hibernate.Post";
 
     /**
diff --git a/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java b/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
index 7b0a1cd..af71876 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
@@ -48,6 +48,7 @@
     /**
      * Returns URL resolved by class loader for classes in examples project.
      *
+     * @param path Path to the resource.
      * @return Resolved URL.
      */
     public static URL url(String path) {
diff --git a/examples/src/main/java/org/apache/ignite/examples/client/ClientKubernetesPutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/client/ClientKubernetesPutGetExample.java
index b775176..92e669c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/client/ClientKubernetesPutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/client/ClientKubernetesPutGetExample.java
@@ -37,7 +37,11 @@
  * </p>
  */
 public class ClientKubernetesPutGetExample {
-    /** Entry point. */
+    /**
+     * Entry point.
+     *
+     * @param args Command line arguments.
+     */
     public static void main(String[] args) throws Exception {
         KubernetesConnectionConfiguration kcfg = new KubernetesConnectionConfiguration();
         kcfg.setNamespace("ignite");
diff --git a/examples/src/main/java/org/apache/ignite/examples/client/ClientPutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/client/ClientPutGetExample.java
index f159423..d8b14ef 100644
--- a/examples/src/main/java/org/apache/ignite/examples/client/ClientPutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/client/ClientPutGetExample.java
@@ -34,7 +34,11 @@
  * </p>
  */
 public class ClientPutGetExample {
-    /** Entry point. */
+    /**
+     * Entry point.
+     *
+     * @param args Command line arguments.
+     */
     public static void main(String[] args) {
         ClientConfiguration cfg = new ClientConfiguration().setAddresses("127.0.0.1:10800");
 
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
index 6e07d81..1755b69 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/ComputeFailoverExample.java
@@ -66,6 +66,7 @@
         }
     }
 
+    /** */
     @ComputeTaskSessionFullSupport
     private static final class CheckPointJob implements IgniteClosure<String, Integer> {
         /** Injected distributed task session. */
diff --git a/examples/src/main/java/org/apache/ignite/examples/encryption/EncryptedCacheExample.java b/examples/src/main/java/org/apache/ignite/examples/encryption/EncryptedCacheExample.java
index 95513b6..793cd9f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/encryption/EncryptedCacheExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/encryption/EncryptedCacheExample.java
@@ -34,7 +34,7 @@
     /** Cache name. */
     private static final String CACHE_NAME = "encrypted-accounts-caches";
 
-    /** */
+    /** @param args Command line arguments. */
     public static void main(String[] args) {
         System.out.println(">>> Starting cluster.");
 
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java
index 618e4c6..0144ea7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/ANNClassificationExportImportExample.java
@@ -115,6 +115,7 @@
         }
     }
 
+    /** */
     private static double evaluateModel(IgniteCache<Integer, double[]> dataCache, NNClassificationModel knnMdl) {
         int amountOfErrors = 0;
         int totalAmount = 0;
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/DecisionTreeClassificationExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/DecisionTreeClassificationExportImportExample.java
index e7ad7ca..a0ed9bf 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/DecisionTreeClassificationExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/DecisionTreeClassificationExportImportExample.java
@@ -116,6 +116,7 @@
         }
     }
 
+    /** */
     private static int evaluateModel(Random rnd, DecisionTreeModel mdl) {
         // Calculate score.
         int correctPredictions = 0;
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesClassificationExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesClassificationExportImportExample.java
index 9aa8f22..eedefba 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesClassificationExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesClassificationExportImportExample.java
@@ -101,6 +101,7 @@
         }
     }
 
+    /** */
     private static void predictOnGeneratedData(GDBModel mdl) {
         System.out.println(">>> ---------------------------------");
         System.out.println(">>> | Prediction\t| Valid answer\t|");
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesRegressionExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesRegressionExportImportExample.java
index 14233e3..bddd425 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesRegressionExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/GDBOnTreesRegressionExportImportExample.java
@@ -101,6 +101,7 @@
         }
     }
 
+    /** */
     private static void predictOnGeneratedData(GDBModel mdl) {
         System.out.println(">>> ---------------------------------");
         System.out.println(">>> | Prediction\t| Valid answer \t|");
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java
index 6bb368f..ba61352 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestClassificationExportImportExample.java
@@ -121,6 +121,7 @@
         }
     }
 
+    /** */
     private static double evaluateModel(IgniteCache<Integer, Vector> dataCache, RandomForestModel randomForestMdl) {
         int amountOfErrors = 0;
         int totalAmount = 0;
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestRegressionExportImportExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestRegressionExportImportExample.java
index 4d7d4ad..372ee67 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestRegressionExportImportExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/exchange/RandomForestRegressionExportImportExample.java
@@ -127,6 +127,7 @@
         }
     }
 
+    /** */
     private static double evaluateModel(IgniteCache<Integer, Vector> dataCache, RandomForestModel randomForestMdl) {
         double mae = 0.0;
         int totalAmount = 0;
diff --git a/examples/src/main/java/org/apache/ignite/examples/opencensus/OpenCensusMetricsExporterExample.java b/examples/src/main/java/org/apache/ignite/examples/opencensus/OpenCensusMetricsExporterExample.java
index 22b82bb..109bcc6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/opencensus/OpenCensusMetricsExporterExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/opencensus/OpenCensusMetricsExporterExample.java
@@ -49,6 +49,9 @@
     /** Export period. */
     private static final long PERIOD = 1_000L;
 
+    /**
+     * @param args Command line arguments.
+     */
     public static void main(String[] args) throws Exception {
         // Setting up prometheus stats collector.
         PrometheusStatsCollector.createAndRegister();
diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
index 3d176eb..7f58879 100644
--- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
@@ -155,7 +155,7 @@
      * Simple closure to demonstrate auto-injection of the service proxy.
      */
     private static class SimpleClosure implements IgniteCallable<Integer> {
-        // Auto-inject service proxy.
+        /** Auto-inject service proxy. */
         @ServiceResource(serviceName = "myClusterSingletonService", proxyInterface = SimpleMapService.class)
         private transient SimpleMapService mapSvc;
 
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
index 7936582..0c2cee6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
@@ -49,6 +49,7 @@
     /** Cache name. */
     private static final String CACHE_NAME = "randomNumbers";
 
+    /** @param args Command line arguments. */
     public static void main(String[] args) throws Exception {
         // Mark this cluster member as client.
         Ignition.setClientMode(true);
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index e1b5ca5..c15a706 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -51,6 +51,7 @@
     /** The list of initial instrument prices. */
     private static final double[] INITIAL_PRICES = {194.9, 893.49, 34.21, 23.24, 57.93, 45.03, 44.41, 28.44, 378.49, 69.50};
 
+    /** @param args Command line arguments. */
     public static void main(String[] args) throws Exception {
         // Mark this cluster member as client.
         Ignition.setClientMode(true);
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
index 251ffb0..da7ae5c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/CacheConfig.java
@@ -32,7 +32,7 @@
  */
 public class CacheConfig {
     /**
-     * Configure streaming cache.
+     * @return Streaming cache configuration.
      */
     public static CacheConfiguration<AffinityUuid, String> wordCache() {
         CacheConfiguration<AffinityUuid, String> cfg = new CacheConfiguration<>("words");
diff --git a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteCatalogExample.java b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteCatalogExample.java
index c9313f6..1507c89 100644
--- a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteCatalogExample.java
+++ b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteCatalogExample.java
@@ -45,7 +45,7 @@
      */
     private static final String CACHE_NAME = "testCache";
 
-    /** */
+    /** @param args Command line arguments. */
     public static void main(String args[]) throws AnalysisException {
 
         setupServerAndData();
diff --git a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameExample.java b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameExample.java
index 20bcf83..546529c 100644
--- a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameExample.java
+++ b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameExample.java
@@ -45,7 +45,7 @@
      */
     private static final String CACHE_NAME = "testCache";
 
-    /** */
+    /** @param args Command line arguments. */
     public static void main(String args[]) {
 
         setupServerAndData();
diff --git a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameJoinExample.java b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameJoinExample.java
index b0a4db6..a238539 100644
--- a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameJoinExample.java
+++ b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameJoinExample.java
@@ -39,7 +39,7 @@
     /** Test cache name. */
     private static final String CACHE_NAME = "testCache";
 
-    /** */
+    /** @param args Command line arguments. */
     public static void main(String args[]) {
 
         setupServerAndData();
diff --git a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameWriteExample.java b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameWriteExample.java
index b0f1194..313a578 100644
--- a/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameWriteExample.java
+++ b/examples/src/main/spark/org/apache/ignite/examples/spark/JavaIgniteDataFrameWriteExample.java
@@ -49,7 +49,7 @@
      */
     private static final String CACHE_NAME = "testCache";
 
-    /** */
+    /** @param args Command line arguments. */
     public static void main(String args[]) {
         //Starting Ignite.
         Ignite ignite = Ignition.start(CONFIG);
diff --git a/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java b/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java
index 0940c1f..fb58627 100644
--- a/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java
+++ b/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java
@@ -27,6 +27,7 @@
 /**
  */
 public class IgniteDataFrameSelfTest extends GridAbstractExamplesTest {
+    /** */
     static final String[] EMPTY_ARGS = new String[0];
 
     /**
diff --git a/examples/src/test/spark/org/apache/ignite/spark/examples/JavaIgniteDataFrameSelfTest.java b/examples/src/test/spark/org/apache/ignite/spark/examples/JavaIgniteDataFrameSelfTest.java
index 5c61289..0e0f6b2 100644
--- a/examples/src/test/spark/org/apache/ignite/spark/examples/JavaIgniteDataFrameSelfTest.java
+++ b/examples/src/test/spark/org/apache/ignite/spark/examples/JavaIgniteDataFrameSelfTest.java
@@ -27,6 +27,7 @@
 /**
  */
 public class JavaIgniteDataFrameSelfTest extends GridAbstractExamplesTest {
+    /** */
     static final String[] EMPTY_ARGS = new String[0];
 
     /**
diff --git a/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java b/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java
index f438032..f937379 100644
--- a/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java
+++ b/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java
@@ -25,6 +25,7 @@
  * SharedRDD  examples self test.
  */
 public class SharedRDDExampleSelfTest extends GridAbstractExamplesTest {
+    /** */
     static final String[] EMPTY_ARGS = new String[0];
 
     /**
diff --git a/modules/azure/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/azure/TcpDiscoveryAzureBlobStoreIpFinderSelfTest.java b/modules/azure/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/azure/TcpDiscoveryAzureBlobStoreIpFinderSelfTest.java
index 3c172c2..d9f87bb 100644
--- a/modules/azure/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/azure/TcpDiscoveryAzureBlobStoreIpFinderSelfTest.java
+++ b/modules/azure/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/azure/TcpDiscoveryAzureBlobStoreIpFinderSelfTest.java
@@ -24,8 +24,10 @@
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest;
 import org.apache.ignite.testsuites.IgniteAzureTestSuite;
 
+/** */
 public class TcpDiscoveryAzureBlobStoreIpFinderSelfTest
         extends TcpDiscoveryIpFinderAbstractSelfTest<TcpDiscoveryAzureBlobStoreIpFinder> {
+    /** */
     private static String containerName;
 
     /**
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/diagnostic/pagelocktracker/JmhPageLockTrackerBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/diagnostic/pagelocktracker/JmhPageLockTrackerBenchmark.java
index 7bffa91..9022608 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/diagnostic/pagelocktracker/JmhPageLockTrackerBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/diagnostic/pagelocktracker/JmhPageLockTrackerBenchmark.java
@@ -57,11 +57,14 @@
     /** */
     @State(Scope.Thread)
     public static class ThreadLocalState {
+        /** */
         PageLockListener pl;
 
+        /** */
         @Param({"2", "4", "8", "16"})
         int stackSize;
 
+        /** */
         @Param({
             "HeapArrayLockStack",
             "HeapArrayLockLog",
@@ -70,11 +73,14 @@
         })
         String type;
 
+        /** */
         @Param({"true", "false"})
         boolean barrier;
 
+        /** */
         int StructureId = 123;
 
+        /** */
         @Setup
         public void doSetup() {
             pl = create(Thread.currentThread().getName(), type, barrier);
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/encryption/JmhKeystoreEncryptionSpiBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/encryption/JmhKeystoreEncryptionSpiBenchmark.java
index 932d57e..4f5391f 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/encryption/JmhKeystoreEncryptionSpiBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/encryption/JmhKeystoreEncryptionSpiBenchmark.java
@@ -41,6 +41,7 @@
     /** Data amount. */
     private static final int DATA_AMOUNT = 100;
 
+    /** */
     public static final int PAGE_SIZE = 1024 * 4;
 
     /** */
@@ -62,16 +63,22 @@
         }
     }
 
+    /** */
     @State(Scope.Thread)
     public static class EncryptionData {
+        /** */
         KeystoreEncryptionSpi encSpi;
 
+        /** */
         KeystoreEncryptionKey[] keys = new KeystoreEncryptionKey[4];
 
+        /** */
         ByteBuffer[][] randomData = new ByteBuffer[DATA_AMOUNT][2];
 
+        /** */
         ByteBuffer res = ByteBuffer.allocate(PAGE_SIZE);
 
+        /** */
         public EncryptionData() {
             encSpi = new KeystoreEncryptionSpi();
 
@@ -82,6 +89,7 @@
             encSpi.spiStart("test-instance");
         }
 
+        /** */
         @Setup(Level.Invocation)
         public void prepareCollection() {
             for (int i = 0; i < keys.length; i++)
@@ -97,12 +105,14 @@
             }
         }
 
+        /** */
         @TearDown(Level.Iteration)
         public void tearDown() {
             //No - op
         }
     }
 
+    /** */
     public static void main(String[] args) throws Exception {
         Options opt = new OptionsBuilder()
             .include(JmhKeystoreEncryptionSpiBenchmark.class.getSimpleName())
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sequence/JmhSequenceBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sequence/JmhSequenceBenchmark.java
index 365cf8f..b89a0b4 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sequence/JmhSequenceBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sequence/JmhSequenceBenchmark.java
@@ -49,6 +49,7 @@
     /** Property: reservation batch size. */
     private static final String PROP_BATCH_SIZE = "ignite.jmh.sequence.batchSize";
 
+    /** */
     @State(Scope.Benchmark)
     public static class SequenceState {
         /** IP finder shared across nodes. */
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
index 2cd2d75..b1ab0b0 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
@@ -56,7 +56,11 @@
     private static final String PREP_STATEMENT_CLUSTER_INSTANCE_ERROR = "You may have used a PreparedStatement that " +
         "was created with another Cluster instance";
 
-    /** Closes Cassandra driver session. */
+    /**
+     * Closes Cassandra driver session.
+     *
+     * @param driverSes Session to close.
+     */
     public static void closeSession(Session driverSes) {
         if (driverSes == null)
             return;
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java
index f2e57a9..dcf5334 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java
@@ -51,6 +51,7 @@
      * @param min minimum sleep time (in milliseconds)
      * @param max maximum sleep time (in milliseconds)
      * @param incr time range shift increment (in milliseconds)
+     * @param log Instance of the Ignite logger.
      */
     public RandomSleeper(int min, int max, int incr, IgniteLogger log) {
         if (min <= 0)
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java
index 91aa4de..19ebbe3 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java
@@ -220,7 +220,7 @@
         invalidate();
     }
 
-    /** Sets maximum time to wait for schema agreement before returning from a DDL query. */
+    /** @param seconds Maximum time to wait for schema agreement before returning from a DDL query. */
     public void setMaxSchemaAgreementWaitSeconds(int seconds) {
         maxSchemaAgreementWaitSeconds = seconds;
 
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java
index 05e3473..facd48c 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java
@@ -112,6 +112,9 @@
     /**
      * Creates instance of {@link PojoField} from the other instance
      * and java class.
+     *
+     * @param field {@link PojoField} instance to copy from.
+     * @param pojoCls Class of the {@link PojoField} instance.
      */
     public PojoField(PojoField field, Class<?> pojoCls) {
         this.name = field.name;
@@ -196,6 +199,7 @@
     /**
      * Returns POJO field annotation.
      *
+     * @param clazz Class of the annotation to get.
      * @return annotation.
      */
     public Annotation getAnnotation(Class clazz) {
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoFieldAccessor.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoFieldAccessor.java
index dd067f7..c8ff3e5 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoFieldAccessor.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoFieldAccessor.java
@@ -91,6 +91,7 @@
     /**
      * Returns POJO field annotation.
      *
+     * @param clazz Class of the annotation to get.
      * @return annotation.
      */
     public Annotation getAnnotation(Class clazz) {
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
index c954ef9..4e45b8b 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
@@ -112,6 +112,7 @@
      * @param fetchSize Number of rows to immediately fetch in CQL statement execution.
      * @param readConsistency Consistency level for Cassandra READ operations (select).
      * @param writeConsistency Consistency level for Cassandra WRITE operations (insert/update/delete).
+     * @param expirationTimeout Expiration timout.
      * @param log Logger.
      */
     public CassandraSessionImpl(Cluster.Builder builder, Integer fetchSize, ConsistencyLevel readConsistency,
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/IdleSession.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/IdleSession.java
index 57eb5d1..0faf4d3 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/IdleSession.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/IdleSession.java
@@ -37,6 +37,7 @@
      * Creates instance of Cassandra driver session wrapper.
      *
      * @param ses Cassandra driver session.
+     * @param expirationTimeout Session expiration timeout.
      */
     public IdleSession(Session ses, long expirationTimeout) {
         this.ses = ses;
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java
index cf72f8a..3fd4801 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java
@@ -97,6 +97,7 @@
      *
      * @param cassandraSes Session wrapper.
      * @param driverSes Driver session.
+     * @param expirationTimeout Expiration timeout.
      */
     public static void put(CassandraSessionImpl cassandraSes, Session driverSes, long expirationTimeout) {
         if (cassandraSes == null || driverSes == null)
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java
index bbf9ae7..a3a2bcd 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java
@@ -48,16 +48,22 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+/** */
 public class CassandraSessionImplTest {
 
+    /** */
     private PreparedStatement preparedStatement1 = mockPreparedStatement();
 
+    /** */
     private PreparedStatement preparedStatement2 = mockPreparedStatement();
 
+    /** */
     private MyBoundStatement1 boundStatement1 = new MyBoundStatement1(preparedStatement1);
 
+    /** */
     private MyBoundStatement2 boundStatement2 = new MyBoundStatement2(preparedStatement2);
 
+    /** */
     @SuppressWarnings("unchecked")
     @Test
     public void executeFailureTest() {
@@ -106,6 +112,7 @@
         assertEquals(10, batchExecutionAssistant.processedCount());
     }
 
+    /** */
     private static PreparedStatement mockPreparedStatement() {
         PreparedStatement ps = mock(PreparedStatement.class);
         when(ps.getVariables()).thenReturn(mock(ColumnDefinitions.class));
@@ -114,10 +121,12 @@
         return ps;
     }
 
+    /** */
     private class MyBatchExecutionAssistant implements BatchExecutionAssistant {
-
+        /** */
         private Set<Integer> processed = new HashSet<>();
 
+        /** {@inheritDoc} */
         @Override public void process(Row row, int seqNum) {
             if (processed.contains(seqNum))
                 return;
@@ -125,26 +134,32 @@
             processed.add(seqNum);
         }
 
+        /** {@inheritDoc} */
         @Override public boolean alreadyProcessed(int seqNum) {
             return processed.contains(seqNum);
         }
 
+        /** {@inheritDoc} */
         @Override public int processedCount() {
             return processed.size();
         }
 
+        /** {@inheritDoc} */
         @Override public boolean tableExistenceRequired() {
             return false;
         }
 
+        /** {@inheritDoc} */
         @Override public String getTable() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public String getStatement() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public BoundStatement bindStatement(PreparedStatement statement, Object obj) {
             if (statement instanceof WrappedPreparedStatement)
                 statement = ((WrappedPreparedStatement)statement).getWrappedStatement();
@@ -159,30 +174,35 @@
             throw new RuntimeException("unexpected");
         }
 
+        /** {@inheritDoc} */
         @Override public KeyValuePersistenceSettings getPersistenceSettings() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public String operationName() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public Object processedData() {
             return null;
         }
 
     }
 
+    /** */
     private static class MyBoundStatement1 extends BoundStatement {
-
+        /** */
         MyBoundStatement1(PreparedStatement ps) {
             super(ps);
         }
 
     }
 
+    /** */
     private static class MyBoundStatement2 extends BoundStatement {
-
+        /** */
         MyBoundStatement2(PreparedStatement ps) {
             super(ps);
         }
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java
index 6b84da7..8678875 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java
@@ -798,7 +798,7 @@
         LOGGER.info("-----------------------------------------------------------------------------------");
     }
 
-    /*
+    /**
      * KeyValuePersistenceSettings is passed directly, not as a bean and should be
      * serialized and deserialized correctly
      */
@@ -859,6 +859,7 @@
         }
     }
 
+    /** */
     private IgniteConfiguration igniteConfig() throws IOException {
         URL url = getClass().getClassLoader().getResource("org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml");
         String persistence = U.readFileToString(url.getFile(), "UTF-8");
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
index 75fdf65..345ed8e 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestsHelper.java
@@ -469,6 +469,7 @@
         return map;
     }
 
+    /** */
     public static Collection<Long> getOrderIds(Map<Long, List<CacheEntryImpl<Long, ProductOrder>>> orders) {
         Set<Long> ids = new HashSet<>();
 
diff --git a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
index d807b88..ff3f160 100644
--- a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
@@ -370,6 +370,7 @@
      * Utility class with custom SQL functions.
      */
     public static class TestSQLFunctions {
+        /** */
         static final Phaser ph = new Phaser(2);
 
         /**
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
index 9a0cb97..07acf99 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
@@ -141,6 +141,7 @@
      * Test task. Returns Id of the node that has split the task,
      */
     private static class TestTask extends ComputeTaskSplitAdapter<Object, String> {
+        /** */
         @IgniteInstanceResource
         private Ignite ignite;
 
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java
index d07ef53..e999d30 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientByteUtilsTest.java
@@ -94,6 +94,7 @@
         }
     }
 
+    /** */
     @Test
     public void testShortToBytes() throws Exception {
         Map<String, Short> map = new HashMap<>();
@@ -119,6 +120,7 @@
         }
     }
 
+    /** */
     @Test
     public void testIntToBytes() throws Exception {
         Map<String, Integer> map = new HashMap<>();
@@ -144,6 +146,7 @@
         }
     }
 
+    /** */
     @Test
     public void testLongToBytes() throws Exception {
         Map<String, Long> map = new LinkedHashMap<>();
@@ -173,6 +176,7 @@
         }
     }
 
+    /** */
     private byte[] asByteArray(String text) {
         String[] split = text.split("-");
         byte[] b = new byte[split.length];
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
index efb6e1d..63997a6 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
@@ -774,6 +774,7 @@
             return success;
         }
 
+        /** */
         Object key() {
             return key;
         }
@@ -787,6 +788,7 @@
         }
     }
 
+    /** */
     private static class Data {
         /** Bytes. */
         private final byte[] bytes;
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
index bb95129..c1d5e08 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
@@ -537,6 +537,7 @@
         });
     }
 
+    /** */
     private void testExpire(Expiration exp) throws Exception {
         try (Jedis jedis = pool.getResource()) {
             jedis.set("k1", "v1");
@@ -555,7 +556,9 @@
         }
     }
 
+    /** */
     private interface Expiration {
+        /** */
         long expire(Jedis jedis, String key);
     }
 }
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
index 9fd6ef2..62d0bb9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
@@ -183,10 +183,12 @@
      */
     @SuppressWarnings("unused")
     public static class Key implements Serializable {
+        /** */
         @QuerySqlField(orderedGroups = {@QuerySqlField.Group(
             name = "date_sec_idx", order = 0, descending = true)})
         private long date;
 
+        /** */
         @QuerySqlField(index = true, orderedGroups = {@QuerySqlField.Group(
             name = "date_sec_idx", order = 3)})
         private int securityId;
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
index 9924bb3..cbc6008 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
@@ -1115,6 +1115,7 @@
     /** */
     @SuppressWarnings("unused")
     public static class Test {
+        /** */
         @QuerySqlField
         private int val;
 
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
index 5d73f7d..40c3e07 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
@@ -168,7 +168,7 @@
      * Test thread.
      */
     private class TestThread extends Thread {
-        /* Thread private random generator. */
+        /** Thread private random generator. */
         private final Random rnd = new Random();
 
         /** Number of iterations to perform. */
diff --git a/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java b/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
index b65f5e2..e3702de 100644
--- a/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
+++ b/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
@@ -134,30 +134,30 @@
  * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
  */
 public class TcpDiscoveryCloudIpFinder extends TcpDiscoveryIpFinderAdapter {
-    /* JCloud default connection timeout. */
+    /** JCloud default connection timeout. */
     private static final String JCLOUD_CONNECTION_TIMEOUT = "10000"; //10 secs
 
-    /* Cloud provider. */
+    /** Cloud provider. */
     private String provider;
 
-    /* Cloud specific identity (user name, email address, etc.). */
+    /** Cloud specific identity (user name, email address, etc.). */
     private String identity;
 
-    /* Cloud specific credential (password, access key, etc.). */
+    /** Cloud specific credential (password, access key, etc.). */
     @GridToStringExclude
     private String credential;
 
-    /* Path to a cloud specific credential. */
+    /** Path to a cloud specific credential. */
     @GridToStringExclude
     private String credentialPath;
 
-    /* Regions where VMs are located. */
+    /** Regions where VMs are located. */
     private TreeSet<String> regions;
 
-    /* Zones where VMs are located. */
+    /** Zones where VMs are located. */
     private TreeSet<String> zones;
 
-    /* Nodes filter by regions and zones. */
+    /** Nodes filter by regions and zones. */
     private Predicate<ComputeMetadata> nodesFilter;
 
     /** Init guard. */
@@ -168,7 +168,7 @@
     @GridToStringExclude
     private final CountDownLatch initLatch = new CountDownLatch(1);
 
-    /* JCloud compute service. */
+    /** JCloud compute service. */
     private ComputeService computeService;
 
     /**
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
index 894f452..6beb0fa 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
@@ -102,6 +102,7 @@
     public static final String TAB = "    ";
 
     /**
+     * @param args Command line arguments.
      * @throws Exception If generation failed.
      */
     public static void main(String[] args) throws Exception {
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
index 3c4c163..8c77962 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
@@ -321,7 +321,14 @@
 
     /** Enum for cover binaryObject enum save/load. */
     public enum TestEnum {
-        /** */A, /** */B, /** */C
+        /** */
+        A,
+
+        /** */
+        B,
+
+        /** */
+        C
     }
 
     /** Special class to test WAL reader resistance to Serializable interface. */
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java
index bd7e3da..6eb60d3 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/AbstractPageCompressionIntegrationTest.java
@@ -169,6 +169,7 @@
         @QuerySqlField
         UUID id;
 
+        /** */
         TestVal(int i) {
             this.str = i + "bla bla bla!";
             this.i = -i;
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
index e80db68..ff328e8 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
@@ -929,11 +929,13 @@
         checkCompressDecompress(page, getContents, false);
     }
 
+    /** */
     private void checkIo(PageIO io, ByteBuffer page) throws IgniteCheckedException {
         assertSame(io, PageIO.getPageIO(bufferAddress(page)));
         assertSame(io, PageIO.getPageIO(page));
     }
 
+    /** */
     private void checkCompressDecompress(ByteBuffer page, Function<ByteBuffer, ?> getPageContents, boolean fullPage)
         throws IgniteCheckedException {
         PageIO.setCrc(page, 0xABCDEF13);
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java
index 40640a7..be5e896 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java
@@ -67,6 +67,7 @@
         doTestSparseFiles(Paths.get("/xfs/test_file"), true);
     }
 
+    /** */
     private static int getFD(FileChannel ch) throws IgniteCheckedException {
         return U.<Integer>field(U.<FileDescriptor>field(ch, "fd"), "fd");
     }
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/argument/FindAndDeleteGarbageArg.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/argument/FindAndDeleteGarbageArg.java
index fa6ed58..6ad32a8 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/argument/FindAndDeleteGarbageArg.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/argument/FindAndDeleteGarbageArg.java
@@ -26,6 +26,7 @@
  * List of extra arguments.
  */
 public enum FindAndDeleteGarbageArg implements CommandArg {
+    /** */
     DELETE("--delete");
 
     /** Argument name. */
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/PageLocksCommand.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/PageLocksCommand.java
index 18d3d5d..727cdd8 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/PageLocksCommand.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/diagnostic/PageLocksCommand.java
@@ -211,6 +211,7 @@
         }
     }
 
+    /** */
     enum PageLocksCommandArg implements CommandArg {
         /** */
         DUMP("dump"),
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/ItemsListStorage.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/ItemsListStorage.java
index 6c3a9c8..749ac8b 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/ItemsListStorage.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/ItemsListStorage.java
@@ -27,6 +27,7 @@
  * Stores all index items.
  */
 class ItemsListStorage<T> implements ItemStorage<T> {
+    /** */
     final List<T> store = new LinkedList<>();
 
     /** {@inheritDoc} */
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/persistence/PersistenceArguments.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/persistence/PersistenceArguments.java
index 8971680..4fd9c3b 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/persistence/PersistenceArguments.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/persistence/PersistenceArguments.java
@@ -81,12 +81,14 @@
             return this;
         }
 
+        /** */
         public Builder withCacheNames(List<String> cacheNames) {
             this.cacheNames = cacheNames;
 
             return this;
         }
 
+        /** */
         public PersistenceArguments build() {
             return new PersistenceArguments(
                 subCmd,
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
index f128e5b..786c11e 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
@@ -242,6 +242,7 @@
      * Indexing that blocks index rebuild until status request is completed.
      */
     private static class BlockingIndexesRebuildTask extends IndexesRebuildTask {
+        /** {@inheritDoc} */
         @Override protected void startRebuild(GridCacheContext cctx, GridFutureAdapter<Void> fut,
             SchemaIndexCacheVisitorClosure clo, IndexRebuildCancelToken cancel) {
             idxRebuildsStartedNum.incrementAndGet();
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index 47453a0..c981908 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -270,6 +270,7 @@
         assertTrue("Still opened clients: " + new ArrayList<>(clnts.values()), clntsBefore.equals(clntsAfter2));
     }
 
+    /** */
     private CacheConfiguration cacheConfiguration(String cacheName) {
         CacheConfiguration ccfg = new CacheConfiguration(cacheName)
             .setAtomicityMode(TRANSACTIONAL)
@@ -1226,10 +1227,12 @@
     public void testConnectivityCommandWithNodeExit() throws Exception {
         IgniteEx[] node3 = new IgniteEx[1];
 
+        /** */
         class KillNode3CommunicationSpi extends TcpCommunicationSpi {
             /** Fail check connection request and stop third node */
             boolean fail;
 
+            /** */
             public KillNode3CommunicationSpi(boolean fail) {
                 this.fail = fail;
             }
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTestUtils.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTestUtils.java
index b40eeeb..a17f743 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTestUtils.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTestUtils.java
@@ -24,6 +24,7 @@
  * Utility class for command handler.
  */
 public class GridCommandHandlerTestUtils {
+    /** */
     public static void addSslParams(List<String> params) {
         params.add("--keystore");
         params.add(GridTestUtils.keyStorePath("node01"));
diff --git a/modules/core/src/main/java/org/apache/ignite/DataRegionMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/DataRegionMetricsAdapter.java
index 2e6536f..350789a 100644
--- a/modules/core/src/main/java/org/apache/ignite/DataRegionMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/DataRegionMetricsAdapter.java
@@ -49,6 +49,7 @@
      * Converts collection of {@link DataRegionMetrics} into collection of legacy {@link MemoryMetrics}.
      *
      * @param dataRegionMetrics Data region metrics collection.
+     * @return Collection of legacy {@link MemoryMetrics}.
      */
     public static Collection<MemoryMetrics> collectionOf(Collection<DataRegionMetrics> dataRegionMetrics) {
         if (dataRegionMetrics == null)
diff --git a/modules/core/src/main/java/org/apache/ignite/DataStorageMetrics.java b/modules/core/src/main/java/org/apache/ignite/DataStorageMetrics.java
index 1a549c5..6da5431 100644
--- a/modules/core/src/main/java/org/apache/ignite/DataStorageMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/DataStorageMetrics.java
@@ -35,7 +35,7 @@
 @Deprecated
 public interface DataStorageMetrics {
     /**
-     * Gets the average number of WAL records per second written during the last time interval.
+     * @return  The average number of WAL records per second written during the last time interval.
      * <p>
      * The length of time interval is configured via {@link DataStorageConfiguration#setMetricsRateTimeInterval(long)}
      * configuration property.
@@ -45,7 +45,7 @@
     public float getWalLoggingRate();
 
     /**
-     * Gets the average number of bytes per second written during the last time interval.
+     * @return  The average number of bytes per second written during the last time interval.
      * The length of time interval is configured via {@link DataStorageConfiguration#setMetricsRateTimeInterval(long)}
      * configuration property.
      * The number of subintervals is configured via {@link DataStorageConfiguration#setMetricsSubIntervalCount(int)}
@@ -54,12 +54,12 @@
     public float getWalWritingRate();
 
     /**
-     * Gets the current number of WAL segments in the WAL archive.
+     * @return The current number of WAL segments in the WAL archive.
      */
     public int getWalArchiveSegments();
 
     /**
-     * Gets the average WAL fsync duration in microseconds over the last time interval.
+     * @return The average WAL fsync duration in microseconds over the last time interval.
      * <p>
      * The length of time interval is configured via {@link DataStorageConfiguration#setMetricsRateTimeInterval(long)}
      * configuration property.
@@ -69,7 +69,7 @@
     public float getWalFsyncTimeAverage();
 
     /**
-     * Returns WAL buffer poll spins number over the last time interval.
+     * @return  WAL buffer poll spins number over the last time interval.
      * <p>
      * The length of time interval is configured via {@link DataStorageConfiguration#setMetricsRateTimeInterval(long)}
      * configuration property.
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 9fff224..d5e5642 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -225,6 +225,8 @@
      * whether the given configuration matches the configuration of the existing cache or not.
      *
      * @param cacheCfg Cache configuration to use.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Instance of started cache.
      * @throws CacheException If a cache with the same name already exists or other error occurs.
      */
@@ -254,6 +256,8 @@
      * If a cache with the same name already exists in the grid, an exception will be thrown.
      *
      * @param cacheName Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Instance of started cache.
      * @throws CacheException If a cache with the same name already exists or other error occurs.
      */
@@ -267,6 +271,8 @@
      * of the existing cache.
      *
      * @param cacheCfg Cache configuration to use.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Existing or newly created cache.
      * @throws CacheException If error occurs.
      */
@@ -276,6 +282,8 @@
      * Gets existing cache with the given name or creates new one using template configuration.
      *
      * @param cacheName Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Existing or newly created cache.
      * @throws CacheException If error occurs.
      */
@@ -298,6 +306,8 @@
      * Adds cache configuration template.
      *
      * @param cacheCfg Cache configuration template.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @throws CacheException If error occurs.
      */
     public <K, V> void addCacheConfiguration(CacheConfiguration<K, V> cacheCfg) throws CacheException;
@@ -314,6 +324,8 @@
      * @param cacheCfg Cache configuration to use.
      * @param nearCfg Near cache configuration to use on local node in case it is not an
      *      affinity node.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @throws CacheException If a cache with the same name already exists or other error occurs.
      * @return Instance of started cache.
      */
@@ -332,6 +344,8 @@
      *
      * @param cacheCfg Cache configuration.
      * @param nearCfg Near cache configuration for client.
+     * @param <K> type.
+     * @param <V> type.
      * @return {@code IgniteCache} instance.
      * @throws CacheException If error occurs.
      */
@@ -346,6 +360,8 @@
      * @param cacheName Cache name.
      * @param nearCfg Near cache configuration.
      * @return Cache instance.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @throws CacheException If error occurs.
      */
     public <K, V> IgniteCache<K, V> createNearCache(String cacheName, NearCacheConfiguration<K, V> nearCfg)
@@ -356,6 +372,8 @@
      *
      * @param cacheName Cache name.
      * @param nearCfg Near configuration.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return {@code IgniteCache} instance.
      * @throws CacheException If error occurs.
      */
@@ -400,6 +418,8 @@
      * {@code IgniteCache} is a fully-compatible implementation of {@code JCache (JSR 107)} specification.
      *
      * @param name Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Instance of the cache for the specified name or {@code null} if one does not exist.
      * @throws CacheException If error occurs.
      */
@@ -425,6 +445,8 @@
      * refer to {@link IgniteDataStreamer} documentation.
      *
      * @param cacheName Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Data streamer.
      * @throws IllegalStateException If node is stopping.
      */
@@ -489,6 +511,7 @@
      * @param name Atomic reference name.
      * @param initVal Initial value for atomic reference. Ignored if {@code create} flag is {@code false}.
      * @param create Boolean flag indicating whether data structure should be created if does not exist.
+     * @param <T> Type of object referred to by this reference.
      * @return Atomic reference for the given name.
      * @throws IgniteException If atomic reference could not be fetched or created.
      */
@@ -503,6 +526,7 @@
      * @param cfg Configuration.
      * @param initVal Initial value for atomic reference. Ignored if {@code create} flag is {@code false}.
      * @param create Boolean flag indicating whether data structure should be created if does not exist.
+     * @param <T> Type of object referred to by this reference.
      * @return Atomic reference for the given name.
      * @throws IgniteException If atomic reference could not be fetched or created.
      */
@@ -517,6 +541,8 @@
      * @param initVal Initial value for atomic stamped. Ignored if {@code create} flag is {@code false}.
      * @param initStamp Initial stamp for atomic stamped. Ignored if {@code create} flag is {@code false}.
      * @param create Boolean flag indicating whether data structure should be created if does not exist.
+     * @param <T> Type of object referred to by this atomic.
+     * @param <S> Type of stamp object.
      * @return Atomic stamped for the given name.
      * @throws IgniteException If atomic stamped could not be fetched or created.
      */
@@ -532,6 +558,8 @@
      * @param initVal Initial value for atomic stamped. Ignored if {@code create} flag is {@code false}.
      * @param initStamp Initial stamp for atomic stamped. Ignored if {@code create} flag is {@code false}.
      * @param create Boolean flag indicating whether data structure should be created if does not exist.
+     * @param <T> Type of object referred to by this atomic.
+     * @param <S> Type of stamp object.
      * @return Atomic stamped for the given name.
      * @throws IgniteException If atomic stamped could not be fetched or created.
      */
@@ -599,6 +627,7 @@
      * @param name Name of queue.
      * @param cap Capacity of queue, {@code 0} for unbounded queue. Ignored if {@code cfg} is {@code null}.
      * @param cfg Queue configuration if new queue should be created.
+     * @param <T> Type of the elements in queue.
      * @return Queue with given properties.
      * @throws IgniteException If queue could not be fetched or created.
      */
@@ -611,6 +640,7 @@
      *
      * @param name Set name.
      * @param cfg Set configuration if new set should be created.
+     * @param <T> Type of the elements in set.
      * @return Set with given properties.
      * @throws IgniteException If set could not be fetched or created.
      */
@@ -680,6 +710,8 @@
      * <p>
      * To avoid permanent data loss for persistent caches it's recommended to return all previously failed baseline
      * nodes to the topology before calling this method.
+     *
+     * @param cacheNames Name of the caches for which lost partitions is reset.
      */
     public void resetLostPartitions(Collection<String> cacheNames);
 
@@ -691,11 +723,12 @@
     public Collection<MemoryMetrics> memoryMetrics();
 
     /**
+     * @param dataRegionName Name of the data region.
      * @return {@link MemoryMetrics} snapshot or {@code null} if no memory region is configured under specified name.
      * @deprecated Check the {@link ReadOnlyMetricRegistry} with "name=io.dataregion.{data_region_name}" instead.
      */
     @Deprecated
-    @Nullable public MemoryMetrics memoryMetrics(String memPlcName);
+    @Nullable public MemoryMetrics memoryMetrics(String dataRegionName);
 
     /**
      * @return {@link PersistenceMetrics} snapshot.
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
index 18e6e91..bb63367 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
@@ -322,6 +322,7 @@
      * Converts provided object to instance of {@link org.apache.ignite.binary.BinaryObject}.
      *
      * @param obj Object to convert.
+     * @param <T> Type of the binary object.
      * @return Converted object or {@code null} if obj is null.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 811c9ed..c12f3bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -228,6 +228,8 @@
      * if default marshaller is used.
      * If not, this method is no-op and will return current cache.
      *
+     * @param <V1> Type of the cache value binary objects.
+     * @param <K1> Type of the cache key.
      * @return New cache instance for binary objects.
      */
     public <K1, V1> IgniteCache<K1, V1> withKeepBinary();
@@ -240,6 +242,8 @@
      * If you want to use atomic operations inside transactions in case they are restricted by system property,
      * you should allow it before transaction start.
      *
+     * @param <V1> Type of the cache value.
+     * @param <K1> Type of the cache key.
      * @return Cache with atomic operations allowed in transactions.
      */
     public <K1, V1> IgniteCache<K1, V1> withAllowAtomicOpsInTx();
@@ -422,6 +426,7 @@
      * See also {@link #query(SqlFieldsQuery)}.
      *
      * @param qry Query.
+     * @param <R> Type of the query result.
      * @return Cursor.
      * @see ScanQuery
      * @see SqlFieldsQuery
@@ -450,6 +455,8 @@
      *
      * @param qry Query.
      * @param transformer Transformer.
+     * @param <T> Type of the initial query result.
+     * @param <R> Type of the transformed query result.
      * @return Cursor.
      */
     public <T, R> QueryCursor<R> query(Query<T> qry, IgniteClosure<T, R> transformer);
@@ -654,6 +661,7 @@
      *
      * @param map Map containing keys and entry processors to be applied to values.
      * @param args Additional arguments to pass to the {@link EntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return The map of {@link EntryProcessorResult}s of the processing per key,
      *      if any, defined by the {@link EntryProcessor} implementation.  No mappings
      *      will be returned for {@link EntryProcessor}s that return a
@@ -669,6 +677,7 @@
      *
      * @param map Map containing keys and entry processors to be applied to values.
      * @param args Additional arguments to pass to the {@link EntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return a Future representing pending completion of the operation. See more about future result
      * at the {@link #invokeAll(Map, Object...)}.
      * @throws TransactionException If operation within transaction is failed.
@@ -1311,6 +1320,7 @@
      * @param key The key to the entry.
      * @param entryProcessor The {@link EntryProcessor} to invoke.
      * @param arguments Additional arguments to pass to the {@link EntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return a Future representing pending completion of the operation.
      * @throws TransactionException If operation within transaction is failed.
      */
@@ -1333,6 +1343,7 @@
      * @param key The key to the entry.
      * @param entryProcessor The {@link CacheEntryProcessor} to invoke.
      * @param arguments Additional arguments to pass to the {@link CacheEntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return The result of the processing, if any, defined by the {@link CacheEntryProcessor} implementation.
      * @throws NullPointerException If key or {@link CacheEntryProcessor} is null
      * @throws IllegalStateException If the cache is {@link #isClosed()}
@@ -1364,6 +1375,7 @@
      * @param key The key to the entry.
      * @param entryProcessor The {@link CacheEntryProcessor} to invoke.
      * @param arguments Additional arguments to pass to the {@link CacheEntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return a Future representing pending completion of the operation.
      * @throws NullPointerException If key or {@link CacheEntryProcessor} is null
      * @throws IllegalStateException If the cache is {@link #isClosed()}
@@ -1427,6 +1439,7 @@
      * @param keys The set of keys.
      * @param entryProcessor The {@link EntryProcessor} to invoke.
      * @param args Additional arguments to pass to the {@link EntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return a Future representing pending completion of the operation.
      * @throws TransactionException If operation within transaction is failed.
      */
@@ -1464,6 +1477,7 @@
      * @param keys The set of keys for entries to process.
      * @param entryProcessor The {@link CacheEntryProcessor} to invoke.
      * @param args Additional arguments to pass to the {@link CacheEntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return The map of {@link EntryProcessorResult}s of the processing per key,
      * if any, defined by the {@link CacheEntryProcessor} implementation.  No mappings
      * will be returned for {@link CacheEntryProcessor}s that return a
@@ -1512,6 +1526,7 @@
      * @param keys The set of keys for entries to process.
      * @param entryProcessor The {@link CacheEntryProcessor} to invoke.
      * @param args Additional arguments to pass to the {@link CacheEntryProcessor}.
+     * @param <T> Type of the cache entry processing result.
      * @return a Future representing pending completion of the operation.
      * @throws NullPointerException If keys or {@link CacheEntryProcessor} are {#code null}.
      * @throws IllegalStateException If the cache is {@link #isClosed()}.
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java
index 8b7cfe0..eb63118 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java
@@ -92,6 +92,7 @@
      * Gets first exception of given class from {@code 'cause'} hierarchy if any.
      *
      * @param cls Cause class to get cause (if {@code null}, {@code null} is returned).
+     * @param <T> Type of the exception cause.
      * @return First causing exception of passed in class, {@code null} otherwise.
      */
     @Nullable public <T extends Throwable> T getCause(@Nullable Class<T> cls) {
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index cf2d2eb..0b9d1c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -71,6 +71,8 @@
      * There's only one instance of node local storage per local node. Node local storage is
      * based on {@link java.util.concurrent.ConcurrentMap} and is safe for multi-threaded access.
      *
+     * @param <K> Type of keys in the node local map.
+     * @param <V> Type of mapped values in the node local map.
      * @return Node local storage instance for the local node.
      */
     public <K, V> ConcurrentMap<K, V> nodeLocalMap();
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
index f686d77..6e9cbea 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -227,6 +227,7 @@
      * @param cacheName Name of the cache to use for affinity co-location.
      * @param affKey Affinity key.
      * @param job Job which will be co-located on the node with given affinity key.
+     * @param <R> Type of the job result.
      * @return Job result.
      * @throws IgniteException If job failed.
      */
@@ -241,6 +242,7 @@
      * @param cacheName Name of the cache to use for affinity co-location.
      * @param affKey Affinity key.
      * @param job Job which will be co-located on the node with given affinity key.
+     * @param <R> Type of the job result.
      * @return a Future representing pending completion of the affinity call.
      * @throws IgniteException If job failed.
      */
@@ -257,6 +259,7 @@
      * @param cacheNames Names of the caches to to reserve the partition. The first cache uses for affinity co-location.
      * @param affKey Affinity key.
      * @param job Job which will be co-located on the node with given affinity key.
+     * @param <R> Type of the job result.
      * @return Job result.
      * @throws IgniteException If job failed.
      */
@@ -273,6 +276,7 @@
      * @param cacheNames Names of the caches to to reserve the partition. The first cache uses for affinity co-location.
      * @param affKey Affinity key.
      * @param job Job which will be co-located on the node with given affinity key.
+     * @param <R> Type of the job result.
      * @return a Future representing pending completion of the affinity call.
      * @throws IgniteException If job failed.
      */
@@ -288,6 +292,7 @@
      * @param cacheNames Names of the caches to to reserve the partition. The first cache uses for affinity co-location.
      * @param partId Partition to reserve.
      * @param job Job which will be co-located on the node with given affinity key.
+     * @param <R> Type of the job result.
      * @return Job result.
      * @throws IgniteException If job failed.
      */
@@ -304,6 +309,7 @@
      * @param cacheNames Names of the caches to to reserve the partition. The first cache uses for affinity co-location.
      * @param partId Partition to reserve.
      * @param job Job which will be co-located on the node with given affinity key.
+     * @param <R> Type of the job result.
      * @return a Future representing pending completion of the affinity call.
      * @throws IgniteException If job failed.
      */
@@ -318,6 +324,8 @@
      *      then task is deployed under a name specified within annotation. Otherwise, full
      *      class name is used as task name.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <R> Type of the task result.
+     * @param <T> Type of the task argument.
      * @return Task result.
      * @throws IgniteException If task failed.
      */
@@ -332,6 +340,8 @@
      *      then task is deployed under a name specified within annotation. Otherwise, full
      *      class name is used as task name.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <R> Type of the task result.
+     * @param <T> Type of the task argument.
      * @return a Future representing pending completion of the task.
      * @throws IgniteException If task failed.
      */
@@ -346,6 +356,8 @@
      *      then task is deployed under a name specified within annotation. Otherwise, full
      *      class name is used as task name.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <R> Type of the task result.
+     * @param <T> Type of the task argument.
      * @return Task result.
      * @throws IgniteException If task failed.
      */
@@ -360,6 +372,8 @@
      *      then task is deployed under a name specified within annotation. Otherwise, full
      *      class name is used as task name.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <R> type.
+     * @param <T> type.
      * @return a Future representing pending completion of the task.
      * @throws IgniteException If task failed.
      */
@@ -378,6 +392,8 @@
      *
      * @param taskName Name of the task to execute.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <R> Type of the task result.
+     * @param <T> Type of the task argument.
      * @return Task result.
      * @throws IgniteException If task failed.
      * @see ComputeTask for information about task execution.
@@ -394,6 +410,8 @@
      *
      * @param taskName Name of the task to execute.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <R> Type of the task result.
+     * @param <T> Type of the task argument.
      * @return a Future representing pending completion of the task.
      * @throws IgniteException If task failed.
      * @see ComputeTask for information about task execution.
@@ -423,6 +441,7 @@
      * job result. Collection of all returned job results is returned from the result future.
      *
      * @param job Job to broadcast to all cluster group nodes.
+     * @param <R> Type of the job result.
      * @return Collection of results for this execution.
      * @throws IgniteException If execution failed.
      */
@@ -434,6 +453,7 @@
      * job result. Collection of all returned job results is returned from the result future.
      *
      * @param job Job to broadcast to all cluster group nodes.
+     * @param <R> Type of the job result.
      * @return a Future representing pending completion of the broadcast execution of the job.
      * @throws IgniteException If execution failed.
      */
@@ -446,6 +466,8 @@
      *
      * @param job Job to broadcast to all cluster group nodes.
      * @param arg Job closure argument.
+     * @param <R> Type of the job result.
+     * @param <T> Type of the job argument.
      * @return Collection of results for this execution.
      * @throws IgniteException If execution failed.
      */
@@ -459,6 +481,8 @@
      *
      * @param job Job to broadcast to all cluster group nodes.
      * @param arg Job closure argument.
+     * @param <R> Type of the job result.
+     * @param <T> Type of the job argument.
      * @return a Future representing pending completion of the broadcast execution of the job.
      * @throws IgniteException If execution failed.
      */
@@ -507,6 +531,7 @@
      * job execution is returned from the result closure.
      *
      * @param job Job to execute.
+     * @param <R> Type of the job result.
      * @return Job result.
      * @throws IgniteException If execution failed.
      */
@@ -518,6 +543,7 @@
      * job execution is returned from the result closure.
      *
      * @param job Job to execute.
+     * @param <R> Type of the job result.
      * @return a Future representing pending completion of the job.
      * @throws IgniteException If execution failed.
      */
@@ -528,6 +554,7 @@
      * Collection of all returned job results is returned from the result future.
      *
      * @param jobs Non-empty collection of jobs to execute.
+     * @param <R> Type of the jobs result.
      * @return Collection of job results for this execution.
      * @throws IgniteException If execution failed.
      */
@@ -539,6 +566,7 @@
      * Collection of all returned job results is returned from the result future.
      *
      * @param jobs Non-empty collection of jobs to execute.
+     * @param <R> Type of the job result.
      * @return a Future representing pending completion of the job.
      * @throws IgniteException If execution failed.
      */
@@ -551,6 +579,8 @@
      *
      * @param jobs Non-empty collection of jobs to execute.
      * @param rdc Reducer to reduce all job results into one individual return value.
+     * @param <R1> Type of the job result.
+     * @param <R2> Type of the result returned by reducer.
      * @return Reduced job result for this execution.
      * @throws IgniteException If execution failed.
      */
@@ -564,6 +594,8 @@
      *
      * @param jobs Non-empty collection of jobs to execute.
      * @param rdc Reducer to reduce all job results into one individual return value.
+     * @param <R1> Type of the job result.
+     * @param <R2> Type of the result returned by reducer.
      * @return a Future with reduced job result for this execution.
      * @throws IgniteException If execution failed.
      */
@@ -577,6 +609,8 @@
      *
      * @param job Job to run.
      * @param arg Job argument.
+     * @param <R> Type of the job result.
+     * @param <T> Type of the job argument.
      * @return Job result.
      * @throws IgniteException If execution failed.
      */
@@ -590,6 +624,8 @@
      *
      * @param job Job to run.
      * @param arg Job argument.
+     * @param <R> Type of the job result.
+     * @param <T> Type of the job argument.
      * @return a Future representing pending completion of the job.
      * @throws IgniteException If execution failed.
      */
@@ -602,6 +638,8 @@
      *
      * @param job Job to run.
      * @param args Job arguments.
+     * @param <R> Type of the job result.
+     * @param <T> Type of the job argument.
      * @return Collection of job results.
      * @throws IgniteException If execution failed.
      */
@@ -615,6 +653,8 @@
      *
      * @param job Job to run.
      * @param args Job arguments.
+     * @param <R> Type of the job result.
+     * @param <T> Type of the job argument.
      * @return a Future representing pending completion of the job.
      * @throws IgniteException If execution failed.
      */
@@ -630,6 +670,9 @@
      * @param job Job to run.
      * @param args Job arguments.
      * @param rdc Reducer to reduce all job results into one individual return value.
+     * @param <R1> Type of the job result.
+     * @param <R2> Type of the reducer argument.
+     * @param <T> Type of the job argument.
      * @return Reduced job result for this execution.
      * @throws IgniteException If execution failed.
      */
@@ -646,6 +689,9 @@
      * @param job Job to run.
      * @param args Job arguments.
      * @param rdc Reducer to reduce all job results into one individual return value.
+     * @param <R1> Type of the job result.
+     * @param <R2> Type of the reducer argument.
+     * @param <T> Type of the job argument.
      * @return a Future with reduced job result for this execution.
      * @throws IgniteException If execution failed.
      */
@@ -655,6 +701,7 @@
     /**
      * Gets tasks future for active tasks started on local node.
      *
+     * @param <R> Type of the task result.
      * @return Map of active tasks keyed by their task task session ID.
      */
     public <R> Map<IgniteUuid, ComputeTaskFuture<R>> activeTaskFutures();
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteEncryption.java b/modules/core/src/main/java/org/apache/ignite/IgniteEncryption.java
index debc779..29d7565 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteEncryption.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteEncryption.java
@@ -68,6 +68,7 @@
      * master key. The node should re-encrypt group keys during recovery on startup. The actual master key
      * name should be set via {@link IgniteSystemProperties#IGNITE_MASTER_KEY_NAME_TO_CHANGE_BEFORE_STARTUP}.
      *
+     * @param masterKeyName Name of the master key.
      * @return Future for this operation.
      */
     public IgniteFuture<Void> changeMasterKey(String masterKeyName);
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
index eba6ce5..45079fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
@@ -83,6 +83,7 @@
      * @param p Predicate filter used to query events on remote nodes.
      * @param timeout Maximum time to wait for result, {@code 0} to wait forever.
      * @param types Event types to be queried.
+     * @param <T> Type of the result events.
      * @return Collection of grid events returned from specified nodes.
      * @throws IgniteException If query failed.
      */
@@ -97,6 +98,7 @@
      * @param p Predicate filter used to query events on remote nodes.
      * @param timeout Maximum time to wait for result, {@code 0} to wait forever.
      * @param types Event types to be queried.
+     * @param <T> Type of the result events.
      * @return a Future representing pending completion of the query. The completed future contains
      *      collection of grid events returned from specified nodes.
      * @throws IgniteException If query failed.
@@ -288,6 +290,7 @@
      * @param filter Optional filtering predicate. Only if predicates evaluates to {@code true} will the event
      *      end the wait.
      * @param types Types of the events to wait for. If not provided, all events will be passed to the filter.
+     * @param <T> Type of the result event instance.
      * @return Grid event.
      * @throws IgniteException If wait was interrupted.
      */
@@ -301,6 +304,7 @@
      * @param filter Optional filtering predicate. Only if predicates evaluates to {@code true} will the event
      *      end the wait.
      * @param types Types of the events to wait for. If not provided, all events will be passed to the filter.
+     * @param <T> type of the result event instance.
      * @return a Future representing pending completion of the operation. The completed future contains grid event.
      * @throws IgniteException If wait was interrupted.
      */
@@ -313,6 +317,7 @@
      * @param p Predicate to filter events. All predicates must be satisfied for the
      *      event to be returned.
      * @param types Event types to be queried.
+     * @param <T> Type of the result events.
      * @return Collection of grid events found on local node.
      */
     public <T extends Event> Collection<T> localQuery(IgnitePredicate<T> p, @Nullable int... types);
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteException.java b/modules/core/src/main/java/org/apache/ignite/IgniteException.java
index 9c2162f..75bbabe 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java
@@ -80,6 +80,7 @@
      * Gets first exception of given class from {@code 'cause'} hierarchy if any.
      *
      * @param cls Cause class to get cause (if {@code null}, {@code null} is returned).
+     * @param <T> Type of the causing exception.
      * @return First causing exception of passed in class, {@code null} otherwise.
      */
     @Nullable public <T extends Throwable> T getCause(@Nullable Class<T> cls) {
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteIllegalStateException.java b/modules/core/src/main/java/org/apache/ignite/IgniteIllegalStateException.java
index 04a542e..0196ffe 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteIllegalStateException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteIllegalStateException.java
@@ -71,6 +71,7 @@
      * Gets first exception of given class from {@code 'cause'} hierarchy if any.
      *
      * @param cls Cause class to get cause (if {@code null}, {@code null} is returned).
+     * @param <T> Type of the causing exception.
      * @return First causing exception of passed in class, {@code null} otherwise.
      */
     @Nullable public <T extends Throwable> T getCause(@Nullable Class<T> cls) {
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
index 98fc605..82d351a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
@@ -201,6 +201,8 @@
      * This is not supported for non-collocated queues.
      *
      * @param job Job which will be co-located with the queue.
+     * @param <R> Type of the job result.
+     * @return Job result.
      * @throws IgniteException If job failed.
      */
     public <R> R affinityCall(IgniteCallable<R> job) throws IgniteException;
@@ -209,6 +211,7 @@
      * Returns queue that will operate with binary objects. This is similar to {@link IgniteCache#withKeepBinary()} but
      * for queues.
      *
+     * @param <V1> Type of the queued binary objects.
      * @return New queue instance for binary objects.
      */
     public <V1> IgniteQueue<V1> withKeepBinary();
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java b/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java
index bf70e85..5cae321 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteScheduler.java
@@ -106,6 +106,7 @@
      * @param ptrn Scheduling pattern in UNIX cron format with optional prefix <tt>{n1, n2}</tt>
      *      where {@code n1} is delay of scheduling in seconds and {@code n2} is the number of execution. Both
      *      parameters are optional.
+     * @param <R> Type of the job result.
      * @return Scheduled execution future.
      */
     public <R> SchedulerFuture<R> scheduleLocal(@NotNull Callable<R> job, String ptrn);
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSemaphore.java b/modules/core/src/main/java/org/apache/ignite/IgniteSemaphore.java
index d5ab7f2..506e741 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSemaphore.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSemaphore.java
@@ -252,6 +252,8 @@
      *
      * @param callable the callable to execute
      * @param numPermits the number of permits to acquire
+     * @param <T> Type of the callable execution result.
+     * @return Callable execution future.
      * @throws Exception if the callable throws an exception
      */
     public <T> IgniteFuture<T> acquireAndExecute(IgniteCallable<T> callable,
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
index 2181c3a..11b2fd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
@@ -586,6 +586,7 @@
      * @param svcItf Interface for the service.
      * @param sticky Whether or not Ignite should always contact the same remote
      *      service or try to load-balance between services.
+     * @param <T> Service type.
      * @return Either proxy over remote service or local service if it is deployed locally.
      * @throws IgniteException If failed to create service proxy.
      */
@@ -602,6 +603,7 @@
      *      service or try to load-balance between services.
      * @param timeout If greater than 0 created proxy will wait for service availability only specified time,
      *  and will limit remote service invocation time.
+     * @param <T> Service type.
      * @return Either proxy over remote service or local service if it is deployed locally.
      * @throws IgniteException If failed to create service proxy.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSet.java b/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
index 7f833cb..25d55ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
@@ -125,6 +125,8 @@
      * This is not supported for non-collocated sets.
      *
      * @param job Job which will be co-located with the set.
+     * @param <R> Type of the job result.
+     * @return Job result.
      * @throws IgniteException If job failed.
      */
     public <R> R affinityCall(IgniteCallable<R> job) throws IgniteException;
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 178ce8e..f4d8dac 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -2025,6 +2025,7 @@
     /**
      * @param enumCls Enum type.
      * @param name Name of the system property or environment variable.
+     * @param <E> Type of the enum.
      * @return Enum value or {@code null} if the property is not set.
      */
     public static <E extends Enum<E>> E getEnum(Class<E> enumCls, String name) {
@@ -2033,6 +2034,8 @@
 
     /**
      * @param name Name of the system property or environment variable.
+     * @param dflt Default value if property is not set.
+     * @param <E> Type of the enum.
      * @return Enum value or the given default.
      */
     public static <E extends Enum<E>> E getEnum(String name, E dflt) {
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index d2db055..9717745 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -429,6 +429,7 @@
      *
      * @param springXmlPath Spring XML configuration file path (cannot be {@code null}).
      * @param beanName Bean name (cannot be {@code null}).
+     * @param <T> Type of the loaded bean.
      * @return Loaded bean instance.
      * @throws IgniteException If bean with provided name was not found or in case any other error.
      */
@@ -447,6 +448,7 @@
      *
      * @param springXmlUrl Spring XML configuration file URL (cannot be {@code null}).
      * @param beanName Bean name (cannot be {@code null}).
+     * @param <T> Type of the loaded bean.
      * @return Loaded bean instance.
      * @throws IgniteException If bean with provided name was not found or in case any other error.
      */
@@ -465,6 +467,7 @@
      *
      * @param springXmlStream Input stream containing Spring XML configuration (cannot be {@code null}).
      * @param beanName Bean name (cannot be {@code null}).
+     * @param <T> Type of the loaded bean.
      * @return Loaded bean instance.
      * @throws IgniteException If bean with provided name was not found or in case any other error.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java b/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
index d01f42e..e7b85fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
@@ -33,6 +33,8 @@
      * configurartion property.
      * The number of subintervals is configured via {@link PersistentStoreConfiguration#setSubIntervals(int)}
      * configuration property.
+     *
+     * @return The average number of WAL records per second written during the last time interval.
      */
     public float getWalLoggingRate();
 
@@ -42,11 +44,13 @@
      * configurartion property.
      * The number of subintervals is configured via {@link PersistentStoreConfiguration#setSubIntervals(int)}
      * configuration property.
+     *
+     * @return The average number of bytes per second written during the last time interval.
      */
     public float getWalWritingRate();
 
     /**
-     * Gets the current number of WAL segments in the WAL archive.
+     * @return The current number of WAL segments in the WAL archive.
      */
     public int getWalArchiveSegments();
 
@@ -57,6 +61,8 @@
      * configurartion property.
      * The number of subintervals is configured via {@link PersistentStoreConfiguration#setSubIntervals(int)}
      * configuration property.
+     *
+     * @return The average WAL fsync duration in microseconds over the last time interval.
      */
     public float getWalFsyncTimeAverage();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/SystemProperty.java b/modules/core/src/main/java/org/apache/ignite/SystemProperty.java
index a1df5c2..63cbb6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/SystemProperty.java
+++ b/modules/core/src/main/java/org/apache/ignite/SystemProperty.java
@@ -28,12 +28,12 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD})
 public @interface SystemProperty {
-    /** Description. */
+    /** @return Description. */
     String value();
 
-    /** Type. */
+    /** @return Type. */
     Class<?> type() default Boolean.class;
 
-    /** Default value. */
+    /** @return Default value. */
     String defaults() default "";
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryField.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryField.java
index 35aa191..180836e 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryField.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryField.java
@@ -40,6 +40,7 @@
      * Get field's value from the given object.
      *
      * @param obj Object.
+     * @param <T> Type of the field value.
      * @return Value.
      */
     public <T> T value(BinaryObject obj);
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
index b525793..212141b 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
@@ -111,6 +111,7 @@
      * Gets field value.
      *
      * @param fieldName Field name.
+     * @param <F> Type of the field value.
      * @return Field value.
      * @throws BinaryObjectException In case of any other error.
      */
@@ -127,6 +128,7 @@
     /**
      * Gets fully deserialized instance of binary object.
      *
+     * @param <T> Type of the deserialized object.
      * @return Fully deserialized instance of binary object.
      * @throws BinaryInvalidTypeException If class doesn't exist.
      * @throws BinaryObjectException In case of any other error.
@@ -138,6 +140,7 @@
      * will be used {@link org.apache.ignite.configuration.IgniteConfiguration#getClassLoader}.
      *
      * @param ldr Class loader.
+     * @param <T> Type of the deserialized object.
      * @return Fully deserialized instance of binary object.
      * @throws BinaryInvalidTypeException If class doesn't exist.
      * @throws BinaryObjectException In case of any other error.
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
index 78740da..c16baf1 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
@@ -82,6 +82,7 @@
      * <p>
      * Collections and maps returned from this method are modifiable.
      *
+     * @param <T> Type of the field value.
      * @param name Field name.
      * @return Field value.
      */
@@ -92,6 +93,7 @@
      *
      * @param name Field name.
      * @param val Field value (cannot be {@code null}).
+     * @return {@code this} for chaining.
      * @see BinaryObject#type()
      */
     public BinaryObjectBuilder setField(String name, Object val);
@@ -104,6 +106,8 @@
      * @param name Field name.
      * @param val Field value.
      * @param type Field type.
+     * @param <T> Type of the field value.
+     * @return {@code this} for chaining.
      * @see BinaryObject#type()
      */
     public <T> BinaryObjectBuilder setField(String name, @Nullable T val, Class<? super T> type);
@@ -115,6 +119,7 @@
      *
      * @param name Field name.
      * @param builder Builder for object field.
+     * @return {@code this} for chaining.
      */
     public BinaryObjectBuilder setField(String name, @Nullable BinaryObjectBuilder builder);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java
index 169d42b..f4a2a27 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java
@@ -118,6 +118,7 @@
 
     /**
      * @return Object.
+     * @param <T> Type of the object to read.
      * @throws BinaryObjectException In case of error.
      */
     @Nullable public <T> T readObject() throws BinaryObjectException;
@@ -213,6 +214,7 @@
     @Nullable public Object[] readObjectArray() throws BinaryObjectException;
 
     /**
+     * @param <T> Type of elements in collection to read.
      * @return Collection.
      * @throws BinaryObjectException In case of error.
      */
@@ -220,6 +222,7 @@
 
     /**
      * @param factory Collection factory.
+     * @param <T> Type of elements in collection to read.
      * @return Collection.
      * @throws BinaryObjectException In case of error.
      */
@@ -227,6 +230,8 @@
         throws BinaryObjectException;
 
     /**
+     * @param <K> Type of keys in the map to read.
+     * @param <V> Type of mapped values in the map to read.
      * @return Map.
      * @throws BinaryObjectException In case of error.
      */
@@ -234,18 +239,22 @@
 
     /**
      * @param factory Map factory.
+     * @param <K> Type of keys in the map to read.
+     * @param <V> Type of mapped values in the map to read.
      * @return Map.
      * @throws BinaryObjectException In case of error.
      */
     @Nullable public <K, V> Map<K, V> readMap(BinaryMapFactory<K, V> factory) throws BinaryObjectException;
 
     /**
+     * @param <T> Type of the enum to read.
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
     @Nullable public <T extends Enum<?>> T readEnum() throws BinaryObjectException;
 
     /**
+     * @param <T> Type of the enum values in array to read.
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java
index 207dc3e..ffa89ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java
@@ -213,12 +213,15 @@
     public void writeObjectArray(@Nullable Object[] val) throws BinaryObjectException;
 
     /**
+     * @param <T> Type of elements in collection to write.
      * @param col Collection to write.
      * @throws BinaryObjectException In case of error.
      */
     public <T> void writeCollection(@Nullable Collection<T> col) throws BinaryObjectException;
 
     /**
+     * @param <K> Type of keys in the map to write.
+     * @param <V> Type of mapped values in the map to write.
      * @param map Map to write.
      * @throws BinaryObjectException In case of error.
      */
@@ -226,12 +229,14 @@
 
     /**
      * @param val Value to write.
+     * @param <T> Type of the enum to write.
      * @throws BinaryObjectException In case of error.
      */
     public <T extends Enum<?>> void writeEnum(T val) throws BinaryObjectException;
 
     /**
      * @param val Value to write.
+     * @param <T> Type of the enum values in array to write.
      * @throws BinaryObjectException In case of error.
      */
     public <T extends Enum<?>> void writeEnumArray(T[] val) throws BinaryObjectException;
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
index b04e746..a2f72b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
@@ -138,6 +138,7 @@
 
     /**
      * @param fieldName Field name.
+     * @param <T> Type of the read object.
      * @return Object.
      * @throws BinaryObjectException In case of error.
      */
@@ -250,6 +251,7 @@
 
     /**
      * @param fieldName Field name.
+     * @param <T> Type of elements in collection to read.
      * @return Collection.
      * @throws BinaryObjectException In case of error.
      */
@@ -258,6 +260,7 @@
     /**
      * @param fieldName Field name.
      * @param factory Collection factory.
+     * @param <T> Type of elements in collection to read.
      * @return Collection.
      * @throws BinaryObjectException In case of error.
      */
@@ -266,6 +269,8 @@
 
     /**
      * @param fieldName Field name.
+     * @param <K> Type of keys in the map to read.
+     * @param <V> Type of mapped values in the map to read.
      * @return Map.
      * @throws BinaryObjectException In case of error.
      */
@@ -274,6 +279,8 @@
     /**
      * @param fieldName Field name.
      * @param factory Map factory.
+     * @param <K> Type of keys in the map to read.
+     * @param <V> Type of mapped values in the map to read.
      * @return Map.
      * @throws BinaryObjectException In case of error.
      */
@@ -281,6 +288,7 @@
 
     /**
      * @param fieldName Field name.
+     * @param <T> Type of the enum to read.
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
@@ -288,6 +296,7 @@
 
     /**
      * @param fieldName Field name.
+     * @param <T> Type of the enum values in array to read.
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java
index f4e0d32..b71e70c 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java
@@ -251,6 +251,7 @@
 
     /**
      * @param fieldName Field name.
+     * @param <T> Type of elements in collection to write.
      * @param col Collection to write.
      * @throws BinaryObjectException In case of error.
      */
@@ -259,6 +260,8 @@
     /**
      * @param fieldName Field name.
      * @param map Map to write.
+     * @param <K> Type of keys in the map to write.
+     * @param <V> Type of mapped values in the map to write.
      * @throws BinaryObjectException In case of error.
      */
     public <K, V> void writeMap(String fieldName, @Nullable Map<K, V> map) throws BinaryObjectException;
@@ -266,6 +269,7 @@
     /**
      * @param fieldName Field name.
      * @param val Value to write.
+     * @param <T> Type of the enum to write.
      * @throws BinaryObjectException In case of error.
      */
     public <T extends Enum<?>> void writeEnum(String fieldName, T val) throws BinaryObjectException;
@@ -273,6 +277,7 @@
     /**
      * @param fieldName Field name.
      * @param val Value to write.
+     * @param <T> Type of the enum values in array to write.
      * @throws BinaryObjectException In case of error.
      */
     public <T extends Enum<?>> void writeEnumArray(String fieldName, T[] val) throws BinaryObjectException;
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java
index f02dfac..3ed89cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java
@@ -38,6 +38,8 @@
 
     /**
      * Gets collection of failed keys.
+     *
+     * @param <K> Type of keys.
      * @return Collection of failed keys.
      */
     public <K> Collection<K> failedKeys() {
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
index 7897e9d..a35b285 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
@@ -164,6 +164,7 @@
 
     /**
      * @param ignite Ignite.
+     * @return Cache manager implementation.
      */
     public javax.cache.CacheManager findManager(Ignite ignite) {
         synchronized (cacheManagers) {
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
index f5356bc..36674d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKey.java
@@ -125,6 +125,8 @@
      * This method is annotated with {@link AffinityKeyMapped} and will be picked up
      * by {@link GridCacheDefaultAffinityKeyMapper} automatically.
      *
+     * @param <T> Type of affinity key.
+     *
      * @return Affinity key to use for affinity mapping.
      */
     public <T> T affinityKey() {
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicy.java
index d68d995..3cf5ee3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicy.java
@@ -125,6 +125,8 @@
 
     /**
      * Sets maximum allowed cache size in bytes.
+     *
+     * @param maxMemSize Maximum allowed cache size in bytes.
      * @return {@code this} for chaining.
      */
     public AbstractEvictionPolicy<K, V> setMaxMemorySize(long maxMemSize) {
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicyFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicyFactory.java
index aa7dea9..9fdd66d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicyFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/AbstractEvictionPolicyFactory.java
@@ -84,6 +84,7 @@
     /**
      * Sets maximum allowed cache size in bytes.
      *
+     * @param maxMemSize Maximum allowed cache size in bytes.
      * @return {@code this} for chaining.
      */
     public AbstractEvictionPolicyFactory setMaxMemorySize(long maxMemSize) {
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
index d671741..5d9af91 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
@@ -54,6 +54,7 @@
     /**
      * Gets metadata added by eviction policy.
      *
+     * @param <T> Type of the metadata value.
      * @return Metadata value or {@code null}.
      */
     @Nullable public <T> T meta();
@@ -62,6 +63,7 @@
      * Adds a new metadata.
      *
      * @param val Metadata value.
+     * @param <T> Type of the metadata value.
      * @return Metadata previously added, or
      *      {@code null} if there was none.
      */
@@ -71,6 +73,7 @@
      * Adds given metadata value only if it was absent.
      *
      * @param val Value to add if it's not attached already.
+     * @param <T> Type of the metadata value.
      * @return {@code null} if new value was put, or current value if put didn't happen.
      */
     @Nullable public <T> T putMetaIfAbsent(T val);
@@ -81,6 +84,7 @@
      *
      * @param curVal Current value to check.
      * @param newVal New value.
+     * @param <T> Type of the metadata value.
      * @return {@code true} if replacement occurred, {@code false} otherwise.
      */
     public <T> boolean replaceMeta(T curVal, T newVal);
@@ -88,6 +92,7 @@
     /**
      * Removes metadata by name.
      *
+     * @param <T> Type of the metadata value.
      * @return Value of removed metadata or {@code null}.
      */
     @Nullable public <T> T removeMeta();
@@ -96,6 +101,7 @@
      * Removes metadata only if its current value is equal to {@code val} passed in.
      *
      * @param val Value to compare.
+     * @param <T> Type of the metadata value.
      * @return {@code True} if value was removed, {@code false} otherwise.
      */
     public <T> boolean removeMeta(T val);
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyFactory.java
index 856865a..d915599 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyFactory.java
@@ -47,12 +47,20 @@
     public FifoEvictionPolicyFactory() {
     }
 
-    /** Constructor. */
+    /**
+     * Constructor.
+     *
+     * @param maxSize Maximum allowed size of cache before entry will start getting evicted.
+     */
     public FifoEvictionPolicyFactory(int maxSize) {
         setMaxSize(maxSize);
     }
 
-    /** */
+    /**
+     * @param maxSize Maximum allowed size of cache before entry will start getting evicted.
+     * @param batchSize Batch size.
+     * @param maxMemSize Sets maximum allowed cache size in bytes.
+     */
     public FifoEvictionPolicyFactory(int maxSize, int batchSize, long maxMemSize) {
         setMaxSize(maxSize);
         setBatchSize(batchSize);
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java
index ff873ac..002610b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java
@@ -46,12 +46,16 @@
     public LruEvictionPolicyFactory() {
     }
 
-    /** */
+    /** @param maxSize Maximum allowed size of cache before entry will start getting evicted. */
     public LruEvictionPolicyFactory(int maxSize) {
         setMaxSize(maxSize);
     }
 
-    /** */
+    /**
+     * @param maxSize Maximum allowed size of cache before entry will start getting evicted.
+     * @param batchSize Batch size.
+     * @param maxMemSize Maximum allowed cache size in bytes.
+     */
     public LruEvictionPolicyFactory(int maxSize, int batchSize, long maxMemSize) {
         setMaxSize(maxSize);
         setBatchSize(batchSize);
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyMBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyMBean.java
index afc02f2..cc84a4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyMBean.java
@@ -74,6 +74,8 @@
 
     /**
      * Sets maximum allowed cache size in bytes.
+     *
+     * @param maxMemSize Maximum allowed cache size in bytes.
      */
     @MXBeanDescription("Set maximum allowed cache size in bytes.")
     public void setMaxMemorySize(long maxMemSize);
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java
index 1d0dfc0..57a05c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyFactory.java
@@ -55,12 +55,16 @@
     public SortedEvictionPolicyFactory() {
     }
 
-    /** */
+    /** @param maxSize Maximum allowed size of cache before entry will start getting evicted. */
     public SortedEvictionPolicyFactory(int maxSize) {
         setMaxSize(maxSize);
     }
 
-    /** */
+    /**
+     * @param maxSize Maximum allowed size of cache before entry will start getting evicted.
+     * @param batchSize Batch size.
+     * @param maxMemSize Maximum allowed cache size in bytes.
+     */
     public SortedEvictionPolicyFactory(int maxSize, int batchSize, long maxMemSize) {
         setMaxSize(maxSize);
         setBatchSize(batchSize);
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyMBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyMBean.java
index 5cedce1..5290620 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicyMBean.java
@@ -74,6 +74,8 @@
 
     /**
      * Sets maximum allowed cache size in bytes.
+     *
+     * @param maxMemSize Maximum allowed cache size in bytes.
      */
     @MXBeanDescription("Set maximum allowed cache size in bytes.")
     public void setMaxMemorySize(long maxMemSize);
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index 4983288..a92cc36 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -353,7 +353,7 @@
     }
 
     /**
-     * Gets partitions for query, in ascending order.
+     * @return Partitions for query, in ascending order.
      */
     @Nullable public int[] getPartitions() {
         return parts;
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
index d4c4b88..b5d0fcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
@@ -262,7 +262,7 @@
     }
 
     /**
-     * Gets partitions for query, in ascending order.
+     * @return Partitions for query, in ascending order.
      */
     @Nullable public int[] getPartitions() {
         return parts;
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
index d36439a..1d942c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
@@ -61,6 +61,7 @@
      * The current attachment may be discarded by attaching {@code null}.
      *
      * @param attachment The object to be attached (or {@code null} to discard current attachment).
+     * @param <T> Type of the previously attached object.
      * @return Previously attached object, if any.
      */
     @Nullable public <T> T attach(@Nullable Object attachment);
@@ -68,6 +69,7 @@
     /**
      * Retrieves the current attachment or {@code null} if there is no attachment.
      *
+     * @param <T> Type of the attached object.
      * @return Currently attached object, if any.
      */
     @Nullable public <T> T attachment();
@@ -76,6 +78,8 @@
      * Gets current session properties. You can add properties directly to the
      * returned map.
      *
+     * @param <K> Type of keys in the properties map.
+     * @param <V> Type of mapped values in the properties map.
      * @return Current session properties.
      */
     public <K, V> Map<K, V> properties();
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcType.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcType.java
index 22f0fac..6114d15 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcType.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcType.java
@@ -92,6 +92,7 @@
      * Sets associated cache name.
      *
      * @param cacheName Cache name.
+     * @return {@code this} for chaining.
      */
     public JdbcType setCacheName(String cacheName) {
         this.cacheName = cacheName;
@@ -112,6 +113,7 @@
      * Sets database schema name.
      *
      * @param dbSchema Schema name.
+     * @return {@code this} for chaining.
      */
     public JdbcType setDatabaseSchema(String dbSchema) {
         this.dbSchema = dbSchema;
diff --git a/modules/core/src/main/java/org/apache/ignite/client/ClientAuthenticationException.java b/modules/core/src/main/java/org/apache/ignite/client/ClientAuthenticationException.java
index 2f6ad34..56bfba5 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/ClientAuthenticationException.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/ClientAuthenticationException.java
@@ -26,6 +26,8 @@
 
     /**
      * Default constructor.
+     *
+     * @param msg Detail exception message.
      */
     public ClientAuthenticationException(String msg) {
         super(msg);
diff --git a/modules/core/src/main/java/org/apache/ignite/client/ClientCache.java b/modules/core/src/main/java/org/apache/ignite/client/ClientCache.java
index 60bc28d..1e6bb91 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/ClientCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/ClientCache.java
@@ -146,6 +146,7 @@
      * NOTE: this operation is distributed and will query all participating nodes for their cache sizes.
      *
      * @param peekModes Optional peek modes. If not provided, then total cache size is returned.
+     * @return The number of all entries cached across all nodes.
      */
     public int size(CachePeekMode... peekModes) throws ClientException;
 
@@ -634,12 +635,16 @@
     /**
      * Clears entry with specified key from the cache.
      * In contrast to {@link #remove(Object)}, this method does not notify event listeners and cache writers.
+     *
+     * @param key Cache entry key to clear.
      */
     public void clear(K key) throws ClientException;
 
     /**
      * Clears entry with specified key from the cache asynchronously.
      * In contrast to {@link #removeAsync(Object)}, this method does not notify event listeners and cache writers.
+     *
+     * @param key Cache entry key to clear.
      * @return Future representing pending completion of the operation.
      */
     public IgniteClientFuture<Void> clearAsync(K key) throws ClientException;
@@ -647,12 +652,16 @@
     /**
      * Clears entries with specified keys from the cache.
      * In contrast to {@link #removeAll(Set)}, this method does not notify event listeners and cache writers.
+     *
+     * @param keys Cache entry keys to clear.
      */
     public void clearAll(Set<? extends K> keys) throws ClientException;
 
     /**
      * Clears entries with specified keys from the cache asynchronously.
      * In contrast to {@link #removeAllAsync(Set)}, this method does not notify event listeners and cache writers.
+     *
+     * @param keys Cache entry keys to clear.
      * @return Future representing pending completion of the operation.
      */
     public IgniteClientFuture<Void> clearAllAsync(Set<? extends K> keys) throws ClientException;
@@ -692,6 +701,8 @@
      * if default marshaller is used.
      * If not, this method is no-op and will return current cache.
      *
+     * @param <K1> Client cache key type.
+     * @param <V1> Client cache value type.
      * @return New cache instance for binary objects.
      */
     public <K1, V1> ClientCache<K1, V1> withKeepBinary();
@@ -700,6 +711,9 @@
      * Returns cache with the specified expired policy set. This policy will be used for each operation invoked on
      * the returned cache.
      *
+     * @param expirePlc Expiration policy.
+     * @param <K1> Client cache key type.
+     * @param <V1> Client cache value type.
      * @return Cache instance with the specified expiry policy set.
      */
     public <K1, V1> ClientCache<K1, V1> withExpirePolicy(ExpiryPolicy expirePlc);
@@ -712,6 +726,7 @@
      * notified about client disconnected event via {@link ClientDisconnectListener} interface if you need it.
      *
      * @param qry Query.
+     * @param <R> Query result type.
      * @return Cursor.
      */
     public <R> QueryCursor<R> query(Query<R> qry);
@@ -724,6 +739,7 @@
      *
      * @param qry Query.
      * @param disconnectListener Listener of client disconnected event.
+     * @param <R> Query result type.
      * @return Cursor.
      */
     public <R> QueryCursor<R> query(ContinuousQuery<K, V> qry, ClientDisconnectListener disconnectListener);
diff --git a/modules/core/src/main/java/org/apache/ignite/client/ClientCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/client/ClientCacheConfiguration.java
index 73a4197..17735e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/ClientCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/ClientCacheConfiguration.java
@@ -181,6 +181,7 @@
 
     /**
      * @param name New cache name.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setName(String name) {
         this.name = name;
@@ -197,6 +198,7 @@
 
     /**
      * @param atomicityMode New Atomicity mode.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setAtomicityMode(CacheAtomicityMode atomicityMode) {
         this.atomicityMode = atomicityMode;
@@ -213,6 +215,7 @@
 
     /**
      * @param backups New number of backups.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setBackups(int backups) {
         this.backups = backups;
@@ -229,6 +232,7 @@
 
     /**
      * @param cacheMode New cache mode.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setCacheMode(CacheMode cacheMode) {
         this.cacheMode = cacheMode;
@@ -250,6 +254,7 @@
 
     /**
      * @param eagerTtl {@code True} if Ignite should eagerly remove expired cache entries.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setEagerTtl(boolean eagerTtl) {
         this.eagerTtl = eagerTtl;
@@ -263,6 +268,8 @@
      * Caches with the same group name share single underlying 'physical' cache (partition set),
      * but are logically isolated. Grouping caches reduces overall overhead, since internal data structures are shared.
      * </p>
+     *
+     * @return {@code this} for chaining.
      */
     public String getGroupName() {
         return grpName;
@@ -270,6 +277,7 @@
 
     /**
      * @param newVal Group name.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setGroupName(String newVal) {
         grpName = newVal;
@@ -278,7 +286,7 @@
     }
 
     /**
-     * Gets default lock acquisition timeout. {@code 0} and means that lock acquisition will never timeout.
+     * @return Default lock acquisition timeout. {@code 0} and means that lock acquisition will never timeout.
      */
     public long getDefaultLockTimeout() {
         return dfltLockTimeout;
@@ -286,6 +294,7 @@
 
     /**
      * @param dfltLockTimeout Default lock timeout.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setDefaultLockTimeout(long dfltLockTimeout) {
         this.dfltLockTimeout = dfltLockTimeout;
@@ -294,7 +303,7 @@
     }
 
     /**
-     * Gets partition loss policy. This policy defines how Ignite will react to a situation when all nodes for
+     * @return Partition loss policy. This policy defines how Ignite will react to a situation when all nodes for
      * some partition leave the cluster.
      */
     public PartitionLossPolicy getPartitionLossPolicy() {
@@ -303,6 +312,7 @@
 
     /**
      * @param newVal Partition loss policy.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setPartitionLossPolicy(PartitionLossPolicy newVal) {
         partLossPlc = newVal;
@@ -311,7 +321,7 @@
     }
 
     /**
-     * Gets flag indicating whether data can be read from backup.
+     * @return Flag indicating whether data can be read from backup.
      * If {@code false} always get data from primary node (never from backup).
      */
     public boolean isReadFromBackup() {
@@ -320,6 +330,7 @@
 
     /**
      * @param readFromBackup Read from backup.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setReadFromBackup(boolean readFromBackup) {
         this.readFromBackup = readFromBackup;
@@ -328,7 +339,7 @@
     }
 
     /**
-     * Gets size (in number bytes) to be loaded within a single rebalance message.
+     * @return Size (in number bytes) to be loaded within a single rebalance message.
      * Rebalancing algorithm will split total data set on every node into multiple
      * batches prior to sending data.
      */
@@ -338,6 +349,7 @@
 
     /**
      * @param rebalanceBatchSize Rebalance batch size.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setRebalanceBatchSize(int rebalanceBatchSize) {
         this.rebalanceBatchSize = rebalanceBatchSize;
@@ -349,7 +361,7 @@
      * To gain better rebalancing performance supplier node can provide more than one batch at rebalancing start and
      * provide one new to each next demand request.
      *
-     * Gets number of batches generated by supply node at rebalancing start.
+     * @return Number of batches generated by supply node at rebalancing start.
      * Minimum is 1.
      */
     public long getRebalanceBatchesPrefetchCount() {
@@ -358,6 +370,7 @@
 
     /**
      * @param rebalanceBatchesPrefetchCnt Rebalance batches prefetch count.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setRebalanceBatchesPrefetchCount(long rebalanceBatchesPrefetchCnt) {
         this.rebalanceBatchesPrefetchCnt = rebalanceBatchesPrefetchCnt;
@@ -366,7 +379,7 @@
     }
 
     /**
-     * Gets delay in milliseconds upon a node joining or leaving topology (or crash) after which rebalancing
+     * @return Delay in milliseconds upon a node joining or leaving topology (or crash) after which rebalancing
      * should be started automatically. Rebalancing should be delayed if you plan to restart nodes
      * after they leave topology, or if you plan to start multiple nodes at once or one after another
      * and don't want to repartition and rebalance until all nodes are started.
@@ -382,6 +395,7 @@
 
     /**
      * @param rebalanceDelay Rebalance delay.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setRebalanceDelay(long rebalanceDelay) {
         this.rebalanceDelay = rebalanceDelay;
@@ -391,6 +405,7 @@
 
     /**
      * Gets rebalance mode.
+     * @return {@code this} for chaining.
      */
     public CacheRebalanceMode getRebalanceMode() {
         return rebalanceMode;
@@ -398,6 +413,7 @@
 
     /**
      * @param rebalanceMode Rebalance mode.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setRebalanceMode(CacheRebalanceMode rebalanceMode) {
         this.rebalanceMode = rebalanceMode;
@@ -406,7 +422,7 @@
     }
 
     /**
-     * Gets cache rebalance order. Rebalance order can be set to non-zero value for caches with
+     * @return Cache rebalance order. Rebalance order can be set to non-zero value for caches with
      * {@link CacheRebalanceMode#SYNC SYNC} or {@link CacheRebalanceMode#ASYNC ASYNC} rebalance modes only.
      * <p/>
      * If cache rebalance order is positive, rebalancing for this cache will be started only when rebalancing for
@@ -424,6 +440,7 @@
 
     /**
      * @param rebalanceOrder Rebalance order.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setRebalanceOrder(int rebalanceOrder) {
         this.rebalanceOrder = rebalanceOrder;
@@ -432,7 +449,7 @@
     }
 
     /**
-     * Time in milliseconds to wait between rebalance messages to avoid overloading of CPU or network.
+     * @return Time in milliseconds to wait between rebalance messages to avoid overloading of CPU or network.
      * When rebalancing large data sets, the CPU or network can get over-consumed with rebalancing messages,
      * which consecutively may slow down the application performance. This parameter helps tune
      * the amount of time to wait between rebalance messages to make sure that rebalancing process
@@ -448,6 +465,7 @@
 
     /**
      * @param newVal Rebalance throttle.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setRebalanceThrottle(long newVal) {
         rebalanceThrottle = newVal;
@@ -456,7 +474,7 @@
     }
 
     /**
-     * Gets rebalance timeout (ms).
+     * @return Rebalance timeout (ms).
      */
     public long getRebalanceTimeout() {
         return rebalanceTimeout;
@@ -464,6 +482,7 @@
 
     /**
      * @param newVal Rebalance timeout.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setRebalanceTimeout(long newVal) {
         rebalanceTimeout = newVal;
@@ -472,7 +491,7 @@
     }
 
     /**
-     * Gets write synchronization mode. This mode controls whether the main caller should wait for update on other
+     * @return Write synchronization mode. This mode controls whether the main caller should wait for update on other
      * nodes to complete or not.
      */
     public CacheWriteSynchronizationMode getWriteSynchronizationMode() {
@@ -481,6 +500,7 @@
 
     /**
      * @param newVal Write synchronization mode.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setWriteSynchronizationMode(CacheWriteSynchronizationMode newVal) {
         writeSynchronizationMode = newVal;
@@ -497,6 +517,7 @@
 
     /**
      * @param newVal Copy on read.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setCopyOnRead(boolean newVal) {
         cpOnRead = newVal;
@@ -513,6 +534,7 @@
 
     /**
      * @param newVal Max concurrent async operations.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setMaxConcurrentAsyncOperations(int newVal) {
         maxConcurrentAsyncOperations = newVal;
@@ -529,6 +551,7 @@
 
     /**
      * @param newVal Data region name.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setDataRegionName(String newVal) {
         dataRegionName = newVal;
@@ -545,6 +568,7 @@
 
     /**
      * @param newVal Statistics enabled.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setStatisticsEnabled(boolean newVal) {
         statisticsEnabled = newVal;
@@ -561,6 +585,7 @@
 
     /**
      * @param newVal Max query iterators count.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setMaxQueryIteratorsCount(int newVal) {
         maxQryIteratorsCnt = newVal;
@@ -577,6 +602,7 @@
 
     /**
      * @param newVal Onheap cache enabled.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setOnheapCacheEnabled(boolean newVal) {
         onheapCacheEnabled = newVal;
@@ -593,6 +619,7 @@
 
     /**
      * @param newVal Query detail metrics size.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setQueryDetailMetricsSize(int newVal) {
         qryDetailMetricsSize = newVal;
@@ -609,6 +636,7 @@
 
     /**
      * @param newVal Query parallelism.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setQueryParallelism(int newVal) {
         qryParallelism = newVal;
@@ -625,6 +653,7 @@
 
     /**
      * @param newVal Sql escape all.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setSqlEscapeAll(boolean newVal) {
         sqlEscapeAll = newVal;
@@ -641,6 +670,7 @@
 
     /**
      * @param newVal Sql index max inline size.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setSqlIndexMaxInlineSize(int newVal) {
         sqlIdxMaxInlineSize = newVal;
@@ -657,6 +687,7 @@
 
     /**
      * @param newVal Sql schema.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setSqlSchema(String newVal) {
         sqlSchema = newVal;
@@ -673,6 +704,7 @@
 
     /**
      * @param newVal Cache key configuration.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setKeyConfiguration(CacheKeyConfiguration... newVal) {
         this.keyCfg = newVal;
@@ -689,6 +721,7 @@
 
     /**
      * @param newVal Query entities configurations.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setQueryEntities(QueryEntity... newVal) {
         qryEntities = newVal;
@@ -705,6 +738,7 @@
 
     /**
      * @param expiryPlc Expiry policy.
+     * @return {@code this} for chaining.
      */
     public ClientCacheConfiguration setExpiryPolicy(ExpiryPolicy expiryPlc) {
         this.expiryPlc = expiryPlc;
diff --git a/modules/core/src/main/java/org/apache/ignite/client/ClientCompute.java b/modules/core/src/main/java/org/apache/ignite/client/ClientCompute.java
index f875ba0..d97b991 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/ClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/ClientCompute.java
@@ -39,6 +39,8 @@
      *
      * @param taskName Name of the task to execute.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <T> Type of the task argument.
+     * @param <R> Type of the task result.
      * @return Task result.
      * @throws ClientException If task failed.
      * @throws InterruptedException If the wait for task completion was interrupted.
@@ -52,6 +54,8 @@
      *
      * @param taskName Name of the task to execute.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <T> Type of the task argument.
+     * @param <R> Type of the task result.
      * @return A Future representing pending completion of the task.
      * @throws ClientException If task failed.
      * @see ComputeTask for information about task execution.
@@ -68,6 +72,8 @@
      *
      * @param taskName Name of the task to execute.
      * @param arg Optional argument of task execution, can be {@code null}.
+     * @param <T> Type of the task argument.
+     * @param <R> Type of the task result.
      * @return A Future representing pending completion of the task.
      * @throws ClientException If task failed.
      * @see ComputeTask for information about task execution.
@@ -77,6 +83,7 @@
     /**
      * Sets timeout for tasks executed by returned {@code ClientCompute} instance.
      *
+     * @param timeout Task execution timeout.
      * @return {@code ClientCompute} instance with given timeout.
      */
     public ClientCompute withTimeout(long timeout);
diff --git a/modules/core/src/main/java/org/apache/ignite/client/ClientReconnectedException.java b/modules/core/src/main/java/org/apache/ignite/client/ClientReconnectedException.java
index 0dc3baa..4b8f80d 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/ClientReconnectedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/ClientReconnectedException.java
@@ -33,6 +33,8 @@
 
     /**
      * Constructs a new exception with the specified message.
+     *
+     * @param msg Detailed exception message.
      */
     public ClientReconnectedException(String msg) {
         super(msg);
diff --git a/modules/core/src/main/java/org/apache/ignite/client/ClientServices.java b/modules/core/src/main/java/org/apache/ignite/client/ClientServices.java
index fe2408e..1be013a 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/ClientServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/ClientServices.java
@@ -36,6 +36,7 @@
      *
      * @param name Service name.
      * @param svcItf Interface for the service.
+     * @param <T> Service type.
      * @return Proxy over remote service.
      */
     public <T> T serviceProxy(String name, Class<? super T> svcItf);
@@ -50,6 +51,7 @@
      * @param svcItf Interface for the service.
      * @param timeout If greater than 0 created proxy will wait for service availability only specified time,
      *  and will limit remote service invocation time.
+     * @param <T> Service type.
      * @return Proxy over remote service.
      */
     public <T> T serviceProxy(String name, Class<? super T> svcItf, long timeout);
diff --git a/modules/core/src/main/java/org/apache/ignite/client/IgniteClient.java b/modules/core/src/main/java/org/apache/ignite/client/IgniteClient.java
index be90df15..8c5b87e 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/IgniteClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/IgniteClient.java
@@ -35,6 +35,9 @@
      * Gets the existing cache or creates a new cache with default configuration if it does not exist.
      *
      * @param name Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
+     * @return Client cache instance.
      */
     public <K, V> ClientCache<K, V> getOrCreateCache(String name) throws ClientException;
 
@@ -42,6 +45,8 @@
      * Gets the existing cache or creates a new cache with default configuration if it does not exist.
      *
      * @param name Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return a Future representing pending completion of the operation, which wraps the resulting cache.
      */
     public <K, V> IgniteClientFuture<ClientCache<K, V>> getOrCreateCacheAsync(String name) throws ClientException;
@@ -50,6 +55,9 @@
      * Gets the existing cache or creates a new cache if it does not exist.
      *
      * @param cfg Cache configuration. If the cache exists, this configuration is ignored.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
+     * @return Client cache instance.
      */
     public <K, V> ClientCache<K, V> getOrCreateCache(ClientCacheConfiguration cfg) throws ClientException;
 
@@ -57,6 +65,8 @@
      * Gets the existing cache or creates a new cache if it does not exist.
      *
      * @param cfg Cache configuration. If the cache exists, this configuration is ignored.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return a Future representing pending completion of the operation, which wraps the resulting cache.
      */
     public <K, V> IgniteClientFuture<ClientCache<K, V>> getOrCreateCacheAsync(ClientCacheConfiguration cfg)
@@ -66,6 +76,9 @@
      * Get existing cache.
      *
      * @param name Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
+     * @return Client cache instance.
      */
     public <K, V> ClientCache<K, V> cache(String name);
 
@@ -85,12 +98,16 @@
     /**
      * Destroys the cache with the given name.
      * Throws {@link ClientException} if the cache does not exist.
+     *
+     * @param name Name of the cache to destroy.
      */
     public void destroyCache(String name) throws ClientException;
 
     /**
      * Destroys the cache with the given name.
      * Throws {@link ClientException} if the cache does not exist.
+     *
+     * @param name Name of the cache to destroy.
      * @return a Future representing pending completion of the operation.
      */
     public IgniteClientFuture<Void> destroyCacheAsync(String name) throws ClientException;
@@ -99,6 +116,8 @@
      * Creates a cache with a default configuration.
      *
      * @param name Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Resulting cache.
      */
     public <K, V> ClientCache<K, V> createCache(String name) throws ClientException;
@@ -107,6 +126,8 @@
      * Creates a cache with a default configuration.
      *
      * @param name Cache name.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return a Future representing pending completion of the operation, which wraps the resulting cache.
      */
     public <K, V> IgniteClientFuture<ClientCache<K, V>> createCacheAsync(String name) throws ClientException;
@@ -115,6 +136,8 @@
      * Creates a cache with the specified configuration.
      *
      * @param cfg Cache configuration.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return Resulting cache.
      */
     public <K, V> ClientCache<K, V> createCache(ClientCacheConfiguration cfg) throws ClientException;
@@ -123,6 +146,8 @@
      * Creates a cache with the specified configuration.
      *
      * @param cfg Cache configuration.
+     * @param <K> Type of the cache key.
+     * @param <V> Type of the cache value.
      * @return a Future representing pending completion of the operation, which wraps the resulting cache.
      */
     public <K, V> IgniteClientFuture<ClientCache<K, V>> createCacheAsync(ClientCacheConfiguration cfg)
diff --git a/modules/core/src/main/java/org/apache/ignite/client/SslMode.java b/modules/core/src/main/java/org/apache/ignite/client/SslMode.java
index 837f289..0005df9 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/SslMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/SslMode.java
@@ -21,6 +21,9 @@
  * SSL/TLS modes.
  */
 public enum SslMode {
-    /** Disabled. */DISABLED,
-    /** Required. */REQUIRED
+    /** Disabled. */
+    DISABLED,
+
+    /** Required. */
+    REQUIRED
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/client/SslProtocol.java b/modules/core/src/main/java/org/apache/ignite/client/SslProtocol.java
index 06dfac9..159e4c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/SslProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/SslProtocol.java
@@ -21,8 +21,16 @@
  * SSL Protocol.
  */
 public enum SslProtocol {
-    /** Supports some version of TLS; may support other versions. */TLS,
-    /** Supports RFC 2246: TLS version 1.0 ; may support other versions. */TLSv1,
-    /** Supports RFC 4346: TLS version 1.1 ; may support other versions. */TLSv1_1,
-    /** Supports RFC 5246: TLS version 1.2 ; may support other versions. */TLSv1_2
+    /** Supports some version of TLS; may support other versions. */
+    TLS,
+
+    /** Supports RFC 2246: TLS version 1.0 ; may support other versions. */
+    TLSv1,
+
+    /** Supports RFC 4346: TLS version 1.1 ; may support other versions. */
+
+    TLSv1_1,
+
+    /** Supports RFC 5246: TLS version 1.2 ; may support other versions. */
+    TLSv1_2
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuation.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuation.java
index 7e64d25..cc7f70a 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuation.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuation.java
@@ -48,6 +48,7 @@
      * pretty standard notation for this concept that originated from Scheme programming
      * language. Basically, the job is held to be continued later, hence the name of the method.
      *
+     * @param <T> Type of the job execution result.
      * @return Always returns {@code null} for convenience to be used in code with return statement.
      * @throws IllegalStateException If job has been already held before.
      */
@@ -71,6 +72,7 @@
      * be continued later, hence the name of the method.
      *
      * @param timeout Timeout in milliseconds after which job will be automatically resumed.
+     * @param <T> Type of the job execution result.
      * @return Always returns {@code null} for convenience to be used in code with return statement.
      * @throws IllegalStateException If job has been already held before
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskName.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskName.java
index f3099dc..d7539aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskName.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskName.java
@@ -33,7 +33,7 @@
 @Target({ElementType.TYPE})
 public @interface ComputeTaskName {
     /**
-     * Optional task name.
+     * @return Optional task name.
      */
     String value();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSpis.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSpis.java
index 89ebe9b..8bb158c 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSpis.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSpis.java
@@ -36,21 +36,21 @@
 @Target({ElementType.TYPE})
 public @interface ComputeTaskSpis {
     /**
-     * Optional load balancing SPI name. By default, SPI name is equal
+     * @return Optional load balancing SPI name. By default, SPI name is equal
      * to the name of the SPI class. You can change SPI name by explicitly
      * supplying {@link org.apache.ignite.spi.IgniteSpi#getName()} parameter in grid configuration.
      */
     public String loadBalancingSpi() default "";
 
     /**
-     * Optional failover SPI name. By default, SPI name is equal
+     * @return  Optional failover SPI name. By default, SPI name is equal
      * to the name of the SPI class. You can change SPI name by explicitly
      * supplying {@link org.apache.ignite.spi.IgniteSpi#getName()} parameter in grid configuration.
      */
     public String failoverSpi() default "";
 
     /**
-     * Optional checkpoint SPI name. By default, SPI name is equal
+     * @return Optional checkpoint SPI name. By default, SPI name is equal
      * to the name of the SPI class. You can change SPI name by explicitly
      * supplying {@link org.apache.ignite.spi.IgniteSpi#getName()} parameter in grid configuration.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
index 8dd3c7b..2916289 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
@@ -152,42 +152,41 @@
 @Target({ElementType.METHOD})
 public @interface Gridify {
     /**
-     * Optional gridify task name. Note that either this name or {@link #taskClass()} must
+     * @return Optional gridify task name. Note that either this name or {@link #taskClass()} must
      * be specified - but not both. If neither one is specified tasks' fully qualified name
      * will be used as a default name.
      */
     String taskName() default "";
 
     /**
-     * Optional gridify task class. Note that either this name or {@link #taskName()} must
+     * @return Optional gridify task class. Note that either this name or {@link #taskName()} must
      * be specified - but not both. If neither one is specified tasks' fully qualified name
      * will be used as a default name.
      */
     Class<? extends ComputeTask<GridifyArgument, ?>> taskClass() default GridifyDefaultTask.class;
 
     /**
-     * Optional gridify task execution timeout. Default is {@code 0}
+     * @return Optional gridify task execution timeout. Default is {@code 0}
      * which indicates that task will not timeout.
      */
     long timeout() default 0;
 
     /**
-     * Optional interceptor class. Since {@code null} are not supported the value of
+     * @return Optional interceptor class. Since {@code null} are not supported the value of
      * {@code GridifyInterceptor.class} acts as a default value.
      */
     Class<? extends GridifyInterceptor> interceptor() default GridifyInterceptor.class;
 
     /**
-     * Name of the grid to use. By default, no-name default grid is used.
+     * @return Name of the grid to use. By default, no-name default grid is used.
      * Refer to {@link org.apache.ignite.Ignition} for information about named grids.
-     *
      * @deprecated Use {@link #igniteInstanceName()}. Nonempty {@link #igniteInstanceName()} takes precedence.
      */
     @Deprecated
     String gridName() default "";
 
     /**
-     * Name of the Ignite instance to use. By default, no-name default Ignite instance is used.
+     * @return Name of the Ignite instance to use. By default, no-name default Ignite instance is used.
      * Refer to {@link org.apache.ignite.Ignition} for information about named Ignite instances.
      */
     String igniteInstanceName() default "";
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
index af2372d..f2b6928 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
@@ -153,24 +153,24 @@
 @Target({ElementType.METHOD})
 public @interface GridifySetToSet {
     /**
-     * Optional node filter to filter nodes participated in job split.
+     * @return Optional node filter to filter nodes participated in job split.
      */
     Class<? extends GridifyNodeFilter> nodeFilter() default GridifyNodeFilter.class;
 
     /**
-     * Optional gridify task execution timeout. Default is {@code 0}
+     * @return Optional gridify task execution timeout. Default is {@code 0}
      * which indicates that task will not timeout.
      */
     long timeout() default 0;
 
     /**
-     * Optional parameter that defines the minimal value below which the
+     * @return Optional parameter that defines the minimal value below which the
      * execution will NOT be grid-enabled.
      */
     int threshold() default 0;
 
     /**
-     * Optional parameter that defines a split size. Split size in other words means how big will
+     * @return Optional parameter that defines a split size. Split size in other words means how big will
      * be the sub-collection
      * that will travel to remote nodes. Note that this is NOT a dynamic setting and you have to set
      * the split size up front. This may look
@@ -191,12 +191,12 @@
     int splitSize() default 0;
 
     /**
-     * Optional interceptor class.
+     * @return Optional interceptor class.
      */
     Class<? extends GridifyInterceptor> interceptor() default GridifyInterceptor.class;
 
     /**
-     * Name of the grid to use. By default, no-name default grid is used.
+     * @return Name of the grid to use. By default, no-name default grid is used.
      * Refer to {@link org.apache.ignite.Ignition} for information about named grids.
      *
      * @deprecated Use {@link #igniteInstanceName()}. Nonempty {@link #igniteInstanceName()} takes precedence.
@@ -205,7 +205,7 @@
     String gridName() default "";
 
     /**
-     * Name of the Ignite instance to use. By default, no-name default Ignite instance is used.
+     * @return Name of the Ignite instance to use. By default, no-name default Ignite instance is used.
      * Refer to {@link org.apache.ignite.Ignition} for information about named Ignite instances.
      */
     String igniteInstanceName() default "";
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
index cb10d3e..c9ec65a 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
@@ -151,24 +151,24 @@
 @Target({ElementType.METHOD})
 public @interface GridifySetToValue {
     /**
-     * Optional node filter to filter nodes participated in job split.
+     * @return Optional node filter to filter nodes participated in job split.
      */
     Class<? extends GridifyNodeFilter> nodeFilter() default GridifyNodeFilter.class;
 
     /**
-     * Optional gridify task execution timeout. Default is {@code 0}
+     * @return Optional gridify task execution timeout. Default is {@code 0}
      * which indicates that task will not timeout.
      */
     long timeout() default 0;
 
     /**
-     * Optional parameter that defines the minimal value below which the
+     * @return Optional parameter that defines the minimal value below which the
      * execution will NOT be grid-enabled.
      */
    int threshold() default 0;
 
     /**
-     * Optional parameter that defines a split size. Split size in other words means how big will
+     * @return Optional parameter that defines a split size. Split size in other words means how big will
      * be the sub-collection
      * that will travel to remote nodes. Note that this is NOT a dynamic setting and you have to set
      * the split size up front. This may look
@@ -189,21 +189,20 @@
     int splitSize() default 0;
 
     /**
-     * Optional interceptor class.
+     * @return Optional interceptor class.
      */
     Class<? extends GridifyInterceptor> interceptor() default GridifyInterceptor.class;
 
     /**
-     * Name of the grid to use. By default, no-name default grid is used.
+     * @return Name of the grid to use. By default, no-name default grid is used.
      * Refer to {@link org.apache.ignite.Ignition} for information about named grids.
-     *
      * @deprecated Use {@link #igniteInstanceName()}. Nonempty {@link #igniteInstanceName()} takes precedence.
      */
     @Deprecated
     String gridName() default "";
 
     /**
-     * Name of the Ignite instance to use. By default, no-name default Ignite instance is used.
+     * @return Name of the Ignite instance to use. By default, no-name default Ignite instance is used.
      * Refer to {@link org.apache.ignite.Ignition} for information about named Ignite instances.
      */
     String igniteInstanceName() default "";
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index afce846..6c4d91e 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -603,6 +603,7 @@
     }
 
     /**
+     * @return Name of the memory policy.
      * @deprecated Use {@link #getDataRegionName()} (String)} instead.
      */
     @Deprecated
@@ -626,6 +627,8 @@
     }
 
     /**
+     * @param memPlcName Memory policy name.
+     * @return {@code this} for chaining.
      * @deprecated Use {@link #setDataRegionName(String)} instead.
      */
     @Deprecated
@@ -755,6 +758,7 @@
      * <p>
      * Defaults to {@link #DFLT_SQL_ONHEAP_CACHE_MAX_SIZE}.
      *
+     * @param sqlOnheapCacheMaxSize Maximum SQL on-heap cache.
      * @return {@code this} for chaining.
      */
     public CacheConfiguration<K, V> setSqlOnheapCacheMaxSize(int sqlOnheapCacheMaxSize) {
@@ -805,6 +809,7 @@
      * Enabling this can greatly improve performance for key-value operations and scan queries,
      * at the expense of RAM usage.
      *
+     * @param platformCfg Platform cache configuration.
      * @return {@code this} for chaining.
      */
     @IgniteExperimental
@@ -2370,6 +2375,7 @@
      * Sets cache key configuration.
      *
      * @param cacheKeyCfg Cache key configuration.
+     * @return {@code this} for chaining.
      */
     public CacheConfiguration<K, V> setKeyConfiguration(CacheKeyConfiguration... cacheKeyCfg) {
         this.keyCfg = cacheKeyCfg;
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java
index 69d9b7b..9f8e7f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java
@@ -141,6 +141,7 @@
      * {@link ClientConnectorConfiguration#DFLT_PORT}, {@link ClientConnectorConfiguration#DFLT_PORT_RANGE}.
      *
      * @param addrs Host addresses.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setAddresses(String... addrs) {
         if (addrs != null)
@@ -158,6 +159,7 @@
 
     /**
      * @param finder Finds server node addresses.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setAddressesFinder(ClientAddressFinder finder) {
         addrFinder = finder;
@@ -174,6 +176,7 @@
 
     /**
      * @param tcpNoDelay whether Nagle's algorithm is enabled.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setTcpNoDelay(boolean tcpNoDelay) {
         this.tcpNoDelay = tcpNoDelay;
@@ -190,6 +193,7 @@
 
     /**
      * @param timeout Send/receive timeout in milliseconds.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setTimeout(int timeout) {
         this.timeout = timeout;
@@ -206,6 +210,7 @@
 
     /**
      * @param sndBufSize Send buffer size.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSendBufferSize(int sndBufSize) {
         this.sndBufSize = sndBufSize;
@@ -222,6 +227,7 @@
 
     /**
      * @param rcvBufSize Send buffer size.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setReceiveBufferSize(int rcvBufSize) {
         this.rcvBufSize = rcvBufSize;
@@ -238,6 +244,7 @@
 
     /**
      * @param binaryCfg Configuration for Ignite Binary objects.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setBinaryConfiguration(BinaryConfiguration binaryCfg) {
         this.binaryCfg = binaryCfg;
@@ -254,6 +261,7 @@
 
     /**
      * @param sslMode SSL mode.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslMode(SslMode sslMode) {
         this.sslMode = sslMode;
@@ -270,6 +278,7 @@
 
     /**
      * @param newVal Ssl client certificate key store path.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslClientCertificateKeyStorePath(String newVal) {
         sslClientCertKeyStorePath = newVal;
@@ -286,6 +295,7 @@
 
     /**
      * @param newVal Ssl client certificate key store password.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslClientCertificateKeyStorePassword(String newVal) {
         sslClientCertKeyStorePwd = newVal;
@@ -302,6 +312,7 @@
 
     /**
      * @param newVal Ssl client certificate key store type.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslClientCertificateKeyStoreType(String newVal) {
         sslClientCertKeyStoreType = newVal;
@@ -318,6 +329,7 @@
 
     /**
      * @param newVal Ssl trust certificate key store path.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslTrustCertificateKeyStorePath(String newVal) {
         sslTrustCertKeyStorePath = newVal;
@@ -334,6 +346,7 @@
 
     /**
      * @param newVal Ssl trust certificate key store password.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslTrustCertificateKeyStorePassword(String newVal) {
         sslTrustCertKeyStorePwd = newVal;
@@ -350,6 +363,7 @@
 
     /**
      * @param newVal Ssl trust certificate key store type.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslTrustCertificateKeyStoreType(String newVal) {
         sslTrustCertKeyStoreType = newVal;
@@ -366,6 +380,7 @@
 
     /**
      * @param newVal Ssl key algorithm.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslKeyAlgorithm(String newVal) {
         sslKeyAlgorithm = newVal;
@@ -382,6 +397,7 @@
 
     /**
      * @param newVal Flag indicating if certificate validation errors should be ignored.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslTrustAll(boolean newVal) {
         sslTrustAll = newVal;
@@ -398,6 +414,7 @@
 
     /**
      * @param newVal Ssl protocol.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslProtocol(SslProtocol newVal) {
         sslProto = newVal;
@@ -414,6 +431,7 @@
 
     /**
      * @param newVal User name.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setUserName(String newVal) {
         userName = newVal;
@@ -430,6 +448,7 @@
 
     /**
      * @param newVal User password.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setUserPassword(String newVal) {
         userPwd = newVal;
@@ -446,6 +465,7 @@
 
     /**
      * @param newVal SSL Context Factory.
+     * @return {@code this} for chaining.
      */
     public ClientConfiguration setSslContextFactory(Factory<SSLContext> newVal) {
         sslCtxFactory = newVal;
@@ -465,6 +485,7 @@
     /**
      * Sets transactions configuration.
      *
+     * @param txCfg Transactions configuration.
      * @return {@code this} for chaining.
      */
     public ClientConfiguration setTransactionConfiguration(ClientTransactionConfiguration txCfg) {
@@ -474,7 +495,7 @@
     }
 
     /**
-     * Gets a value indicating whether partition awareness should be enabled.
+     * @return A value indicating whether partition awareness should be enabled.
      * <p>
      * Default is {@code true}: client sends requests directly to the primary node for the given cache key.
      * To do so, connection is established to every known server node.
@@ -493,6 +514,7 @@
      * <p>
      * When {@code false}, only one connection is established at a given moment to a random server node.
      *
+     * @param partitionAwarenessEnabled Value indicating whether partition awareness should be enabled.
      * @return {@code this} for chaining.
      */
     public ClientConfiguration setPartitionAwarenessEnabled(boolean partitionAwarenessEnabled) {
@@ -502,7 +524,7 @@
     }
 
     /**
-     * Gets reconnect throttling period.
+     * @return reconnect throttling period.
      */
     public long getReconnectThrottlingPeriod() {
         return reconnectThrottlingPeriod;
@@ -511,6 +533,7 @@
     /**
      * Sets reconnect throttling period.
      *
+     * @param reconnectThrottlingPeriod Reconnect throttling period.
      * @return {@code this} for chaining.
      */
     public ClientConfiguration setReconnectThrottlingPeriod(long reconnectThrottlingPeriod) {
@@ -520,7 +543,7 @@
     }
 
     /**
-     * Gets reconnect throttling retries.
+     * @return Reconnect throttling retries.
      */
     public int getReconnectThrottlingRetries() {
         return reconnectThrottlingRetries;
@@ -529,6 +552,7 @@
     /**
      * Sets reconnect throttling retries.
      *
+     * @param reconnectThrottlingRetries Reconnect throttling retries.
      * @return {@code this} for chaining.
      */
     public ClientConfiguration setReconnectThrottlingRetries(int reconnectThrottlingRetries) {
@@ -538,7 +562,7 @@
     }
 
     /**
-     * Get retry limit.
+     * @return Retry limit.
      */
     public int getRetryLimit() {
         return retryLimit;
@@ -549,6 +573,7 @@
      * are available, Ignite will retry the request on every connection. When this property is greater than zero,
      * Ignite will limit the number of retries.
      *
+     * @param retryLimit Retry limit.
      * @return {@code this} for chaining.
      */
     public ClientConfiguration setRetryLimit(int retryLimit) {
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectorConfiguration.java
index b1f0c68..1781659 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectorConfiguration.java
@@ -574,7 +574,7 @@
     }
 
     /**
-     * Gets thin-client specific configuration.
+     * @return Thin-client specific configuration.
      */
     public ThinClientConfiguration getThinClientConfiguration() {
         return thinCliCfg;
@@ -583,6 +583,7 @@
     /**
      * Sets thin-client specific configuration.
      *
+     * @param thinCliCfg Thin-client specific configuration..
      * @return {@code this} for chaining.
      */
     public ClientConnectorConfiguration setThinClientConfiguration(ThinClientConfiguration thinCliCfg) {
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
index e62707e..d27cc8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
@@ -421,6 +421,7 @@
      *
      * @param pageSize Page size in bytes. Supported values are: {@code 1024}, {@code 2048}, {@code 4096}, {@code 8192}
      * and {@code 16384}. If value is not set (or zero), {@link #DFLT_PAGE_SIZE} ({@code 4096}) will be used.
+     * @return {@code this} for chaining.
      * @see #MIN_PAGE_SIZE
      * @see #MAX_PAGE_SIZE
      */
@@ -451,6 +452,7 @@
      * Sets data regions configurations.
      *
      * @param dataRegionConfigurations Data regions configurations.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setDataRegionConfigurations(DataRegionConfiguration... dataRegionConfigurations) {
         this.dataRegions = dataRegionConfigurations;
@@ -475,6 +477,7 @@
      * If value is not positive, the number of available CPUs will be used.
      *
      * @param concLvl Mapping table concurrency level.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setConcurrencyLevel(int concLvl) {
         this.concLvl = concLvl;
@@ -494,6 +497,7 @@
      * Overrides configuration of default data region which is created automatically.
      *
      * @param dfltDataRegConf Default data region configuration.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setDefaultDataRegionConfiguration(DataRegionConfiguration dfltDataRegConf) {
         this.dfltDataRegConf = dfltDataRegConf;
@@ -502,7 +506,7 @@
     }
 
     /**
-     * Returns a path the root directory where the Persistent Store will persist data and indexes.
+     * @return A path the root directory where the Persistent Store will persist data and indexes.
      */
     public String getStoragePath() {
         return storagePath;
@@ -513,6 +517,7 @@
      * By default the Persistent Store's files are located under Ignite work directory.
      *
      * @param persistenceStorePath Persistence store path.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setStoragePath(String persistenceStorePath) {
         this.storagePath = persistenceStorePath;
@@ -773,6 +778,7 @@
      * Sets flag indicating whether CDC enabled.
      *
      * @param cdcEnabled CDC enabled flag.
+     * @return {@code this} for chaining.
      */
     @IgniteExperimental
     public DataStorageConfiguration setCdcEnabled(boolean cdcEnabled) {
@@ -806,6 +812,7 @@
      * Sets flag indicating whether persistence metrics collection is enabled.
      *
      * @param metricsEnabled Metrics enabled flag.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setMetricsEnabled(boolean metricsEnabled) {
         this.metricsEnabled = metricsEnabled;
@@ -814,7 +821,7 @@
     }
 
     /**
-     * Gets flag indicating whether write throttling is enabled.
+     * @return  Flag indicating whether write throttling is enabled.
      */
     public boolean isWriteThrottlingEnabled() {
         return writeThrottlingEnabled;
@@ -824,6 +831,7 @@
      * Sets flag indicating whether write throttling is enabled.
      *
      * @param writeThrottlingEnabled Write throttling enabled flag.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWriteThrottlingEnabled(boolean writeThrottlingEnabled) {
         this.writeThrottlingEnabled = writeThrottlingEnabled;
@@ -848,6 +856,7 @@
      * hits will be tracked.
      *
      * @param metricsRateTimeInterval Time interval in milliseconds.
+     * @return {@code this} for chaining.
      * @deprecated Use {@link MetricsMxBean#configureHitRateMetric(String, long)} instead.
      */
     @Deprecated
@@ -873,6 +882,7 @@
      * Sets the number of sub-intervals to split the {@link #getMetricsRateTimeInterval()} into to track the update history.
      *
      * @param metricsSubIntervalCnt The number of sub-intervals for history tracking.
+     * @return {@code this} for chaining.
      * @deprecated Use {@link MetricsMxBean#configureHitRateMetric(String, long)} instead.
      */
     @Deprecated
@@ -897,6 +907,7 @@
      * Different type provides different guarantees for consistency. See {@link WALMode} for details.
      *
      * @param walMode Wal mode.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWalMode(WALMode walMode) {
         if (walMode == WALMode.DEFAULT)
@@ -922,6 +933,7 @@
      * Each thread which write to wal have thread local buffer for serialize recode before write in wal.
      *
      * @param walTlbSize Thread local buffer size (in bytes).
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWalThreadLocalBufferSize(int walTlbSize) {
         this.walTlbSize = walTlbSize;
@@ -944,6 +956,7 @@
      * If value isn't positive it calculation will be based on {@link #getWalSegmentSize()}.
      *
      * @param walBuffSize WAL buffer size(in bytes).
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWalBufferSize(int walBuffSize) {
         this.walBuffSize = walBuffSize;
@@ -966,6 +979,7 @@
      * all other WAL modes.
      *
      * @param walFlushFreq WAL flush frequency, in milliseconds.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWalFlushFrequency(long walFlushFreq) {
         this.walFlushFreq = walFlushFreq;
@@ -974,7 +988,7 @@
     }
 
     /**
-     * Property that allows to trade latency for throughput in {@link WALMode#FSYNC} mode.
+     * @return Property that allows to trade latency for throughput in {@link WALMode#FSYNC} mode.
      * It limits minimum time interval between WAL fsyncs. First thread that initiates WAL fsync will wait for
      * this number of nanoseconds, another threads will just wait fsync of first thread (similar to CyclicBarrier).
      * Total throughput should increase under load as total WAL fsync rate will be limited.
@@ -990,6 +1004,7 @@
      * Total throughput should increase under load as total WAL fsync rate will be limited.
      *
      * @param walFsyncDelayNanos Wal fsync delay, in nanoseconds.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWalFsyncDelayNanos(long walFsyncDelayNanos) {
         walFsyncDelay = walFsyncDelayNanos;
@@ -1012,6 +1027,7 @@
      * disk (for one reading), during go ahead wal.
      *
      * @param walRecordIterBuffSize Wal record iterator buffer size.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWalRecordIteratorBufferSize(int walRecordIterBuffSize) {
         this.walRecordIterBuffSize = walRecordIterBuffSize;
@@ -1020,7 +1036,7 @@
     }
 
     /**
-     * Gets flag that enforces writing full page to WAL on every change (instead of delta record).
+     * @return  Flag that enforces writing full page to WAL on every change (instead of delta record).
      * Can be used for debugging purposes: every version of page will be present in WAL.
      * Note that WAL will take several times more space in this mode.
      */
@@ -1034,6 +1050,7 @@
      * Note that WAL will take several times more space in this mode.
      *
      * @param alwaysWriteFullPages Always write full pages flag.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setAlwaysWriteFullPages(boolean alwaysWriteFullPages) {
         this.alwaysWriteFullPages = alwaysWriteFullPages;
@@ -1056,6 +1073,7 @@
      * which is used for data storage files read/write operations
      *
      * @param fileIOFactory File I/O factory
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setFileIOFactory(FileIOFactory fileIOFactory) {
         this.fileIOFactory = fileIOFactory;
@@ -1119,6 +1137,7 @@
      * This property defines order of writing pages to disk storage during checkpoint.
      *
      * @param checkpointWriteOrder Checkpoint write order.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setCheckpointWriteOrder(CheckpointWriteOrder checkpointWriteOrder) {
         this.checkpointWriteOrder = checkpointWriteOrder;
@@ -1137,6 +1156,7 @@
      * Sets flag indicating whether WAL compaction is enabled.
      *
      * @param walCompactionEnabled Wal compaction enabled flag.
+     * @return {@code this} for chaining.
      */
     public DataStorageConfiguration setWalCompactionEnabled(boolean walCompactionEnabled) {
         this.walCompactionEnabled = walCompactionEnabled;
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index aa3109d..ea5d316 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1677,10 +1677,11 @@
     }
 
     /**
-     * Compression level for internal network messages.
+     * Sets compression level for internal network messages.
+     * @param netCompressionLevel Compression level for internal network messages.
      * <p>
      * If not provided, then default value
-     * Deflater.BEST_SPEED is used.
+     * {@link Deflater#BEST_SPEED} is used.
      *
      */
     public void setNetworkCompressionLevel(int netCompressionLevel) {
@@ -1930,6 +1931,7 @@
      * Sets SSL context factory that will be used for creating a secure socket  layer.
      *
      * @param sslCtxFactory Ssl context factory.
+     * @return {@code this} for chaining.
      * @see SslContextFactory
      */
     public IgniteConfiguration setSslContextFactory(Factory<SSLContext> sslCtxFactory) {
@@ -2599,6 +2601,7 @@
      * Sets cache configurations.
      *
      * @param cacheCfg Cache configurations.
+     * @return {@code this} for chaining.
      */
     @SuppressWarnings({"ZeroLengthArrayAllocation"})
     public IgniteConfiguration setCacheConfiguration(CacheConfiguration... cacheCfg) {
@@ -2644,6 +2647,7 @@
      * Cache key configuration defines
      *
      * @param cacheKeyCfg Cache key configuration.
+     * @return {@code this} for chaining.
      */
     public IgniteConfiguration setCacheKeyConfiguration(CacheKeyConfiguration... cacheKeyCfg) {
         this.cacheKeyCfg = cacheKeyCfg;
@@ -2664,6 +2668,7 @@
      * Sets configuration for Ignite Binary objects.
      *
      * @param binaryCfg Binary configuration object.
+     * @return {@code this} for chaining.
      */
     public IgniteConfiguration setBinaryConfiguration(BinaryConfiguration binaryCfg) {
         this.binaryCfg = binaryCfg;
@@ -3167,6 +3172,7 @@
      * @param snapshotPath By default the relative {@link #DFLT_SNAPSHOT_DIRECTORY} is used.
      * The value can be configured as relative path starting from the Ignites {@link #getWorkDirectory()}
      * or the value can be represented as an absolute snapshot working path instead.
+     * @return {@code this} for chaining.
      */
     public IgniteConfiguration setSnapshotPath(String snapshotPath) {
         this.snapshotPath = snapshotPath;
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
index 74c926e..8d9ffbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
@@ -177,6 +177,7 @@
      * Default value is {@link #DFLT_PAGE_SIZE}
      *
      * @param pageSize Page size in bytes.
+     * @return {@code this} for chaining.
      */
     public MemoryConfiguration setPageSize(int pageSize) {
         A.ensure(pageSize >= 1024 && pageSize <= 16 * 1024, "Page size must be between 1kB and 16kB.");
@@ -202,6 +203,7 @@
      * Sets memory policies configurations.
      *
      * @param memPlcs Memory policies configurations.
+     * @return {@code this} for chaining.
      */
     public MemoryConfiguration setMemoryPolicies(MemoryPolicyConfiguration... memPlcs) {
         this.memPlcs = memPlcs;
@@ -247,6 +249,7 @@
      * Sets the number of concurrent segments in Ignite internal page mapping tables.
      *
      * @param concLvl Mapping table concurrency level.
+     * @return {@code this} for chaining.
      */
     public MemoryConfiguration setConcurrencyLevel(int concLvl) {
         this.concLvl = concLvl;
@@ -273,6 +276,7 @@
      * without having to use more verbose syntax of MemoryPolicyConfiguration elements.
      *
      * @param dfltMemPlcSize Size of default memory policy overridden by user.
+     * @return {@code this} for chaining.
      */
     public MemoryConfiguration setDefaultMemoryPolicySize(long dfltMemPlcSize) {
         this.dfltMemPlcSize = dfltMemPlcSize;
@@ -299,6 +303,7 @@
      * If nothing is specified by user, it is set to {@link #DFLT_MEM_PLC_DEFAULT_NAME} value.
      *
      * @param dfltMemPlcName Name of a memory policy to be used as default one.
+     * @return {@code this} for chaining.
      */
     public MemoryConfiguration setDefaultMemoryPolicyName(String dfltMemPlcName) {
         this.dfltMemPlcName = dfltMemPlcName;
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
index 07bdd9d..4a0d429 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
@@ -170,7 +170,7 @@
     private boolean writeThrottlingEnabled = DFLT_WRITE_THROTTLING_ENABLED;
 
     /**
-     * Returns a path the root directory where the Persistent Store will persist data and indexes.
+     * @return Path the root directory where the Persistent Store will persist data and indexes.
      */
     public String getPersistentStorePath() {
         return persistenceStorePath;
@@ -181,6 +181,7 @@
      * By default the Persistent Store's files are located under Ignite work directory.
      *
      * @param persistenceStorePath Persistence store path.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setPersistentStorePath(String persistenceStorePath) {
         this.persistenceStorePath = persistenceStorePath;
@@ -401,6 +402,7 @@
      * Sets flag indicating whether persistence metrics collection is enabled.
      *
      * @param metricsEnabled Metrics enabled flag.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setMetricsEnabled(boolean metricsEnabled) {
         this.metricsEnabled = metricsEnabled;
@@ -409,7 +411,7 @@
     }
 
     /**
-     * Gets flag indicating whether write throttling is enabled.
+     * @return Flag indicating whether write throttling is enabled.
      */
     public boolean isWriteThrottlingEnabled() {
         return writeThrottlingEnabled;
@@ -419,6 +421,7 @@
      * Sets flag indicating whether write throttling is enabled.
      *
      * @param writeThrottlingEnabled Write throttling enabled flag.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setWriteThrottlingEnabled(boolean writeThrottlingEnabled) {
         this.writeThrottlingEnabled = writeThrottlingEnabled;
@@ -443,6 +446,7 @@
      * hits will be tracked.
      *
      * @param rateTimeInterval Time interval in milliseconds.
+     * @return {@code this} for chaining.
      * @deprecated Use {@link MetricsMxBean#configureHitRateMetric(String, long)} instead.
      */
     @Deprecated
@@ -468,6 +472,7 @@
      * Sets the number of sub-intervals to split the {@link #getRateTimeInterval()} into to track the update history.
      *
      * @param subIntervals The number of sub-intervals for history tracking.
+     * @return {@code this} for chaining.
      * @deprecated Use {@link MetricsMxBean#configureHitRateMetric(String, long)} instead.
      */
     @Deprecated
@@ -489,6 +494,7 @@
 
     /**
      * @param walMode Wal mode.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setWalMode(WALMode walMode) {
         if (walMode == WALMode.DEFAULT)
@@ -513,6 +519,7 @@
 
     /**
      * @param tlbSize WAL buffer size.
+     * @return {@code this} for chaining.
      * @deprecated Instead {@link #setWalBufferSize(int walBuffSize)} should be used.
      */
     @Deprecated
@@ -533,6 +540,7 @@
 
     /**
      * @param walBuffSize WAL buffer size.
+     * @return {@code this} for chaining.
      */
     @Deprecated
     public PersistentStoreConfiguration setWalBufferSize(int walBuffSize) {
@@ -556,6 +564,7 @@
      *  all other WAL modes.
      *
      * @param walFlushFreq WAL flush frequency, in milliseconds.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setWalFlushFrequency(long walFlushFreq) {
         this.walFlushFreq = walFlushFreq;
@@ -564,7 +573,7 @@
     }
 
     /**
-     * Gets the fsync delay, in nanoseconds.
+     * @return The fsync delay, in nanoseconds.
      */
     public long getWalFsyncDelayNanos() {
         return walFsyncDelay <= 0 ? DFLT_WAL_FSYNC_DELAY : walFsyncDelay;
@@ -572,6 +581,7 @@
 
     /**
      * @param walFsyncDelayNanos Wal fsync delay, in nanoseconds.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setWalFsyncDelayNanos(long walFsyncDelayNanos) {
         walFsyncDelay = walFsyncDelayNanos;
@@ -591,6 +601,7 @@
 
     /**
      * @param walRecordIterBuffSize Wal record iterator buffer size.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setWalRecordIteratorBufferSize(int walRecordIterBuffSize) {
         this.walRecordIterBuffSize = walRecordIterBuffSize;
@@ -599,7 +610,7 @@
     }
 
     /**
-     *
+     * @return Whether full page must be always written.
      */
     public boolean isAlwaysWriteFullPages() {
         return alwaysWriteFullPages;
@@ -607,6 +618,7 @@
 
     /**
      * @param alwaysWriteFullPages Always write full pages.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setAlwaysWriteFullPages(boolean alwaysWriteFullPages) {
         this.alwaysWriteFullPages = alwaysWriteFullPages;
@@ -626,6 +638,7 @@
 
     /**
      * @param fileIOFactory File I/O factory
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setFileIOFactory(FileIOFactory fileIOFactory) {
         this.fileIOFactory = fileIOFactory;
@@ -668,6 +681,7 @@
      * This property defines order of writing pages to disk storage during checkpoint.
      *
      * @param checkpointWriteOrder Checkpoint write order.
+     * @return {@code this} for chaining.
      */
     public PersistentStoreConfiguration setCheckpointWriteOrder(CheckpointWriteOrder checkpointWriteOrder) {
         this.checkpointWriteOrder = checkpointWriteOrder;
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java
index 94efd64..5ff3410 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java
@@ -57,7 +57,7 @@
     }
 
     /**
-     * Gets active transactions count per connection limit.
+     * @return Active transactions count per connection limit.
      */
     public int getMaxActiveTxPerConnection() {
         return maxActiveTxPerConn;
@@ -66,6 +66,7 @@
     /**
      * Sets active transactions count per connection limit.
      *
+     * @param maxActiveTxPerConn Active transactions count per connection limit.
      * @return {@code this} for chaining.
      */
     public ThinClientConfiguration setMaxActiveTxPerConnection(int maxActiveTxPerConn) {
@@ -87,6 +88,7 @@
      * Sets active compute tasks per connection limit.
      * Value {@code 0} means that compute grid functionality is disabled for thin clients.
      *
+     * @param maxActiveComputeTasksPerConn Active compute tasks per connection limit.
      * @return {@code this} for chaining.
      */
     public ThinClientConfiguration setMaxActiveComputeTasksPerConnection(int maxActiveComputeTasksPerConn) {
diff --git a/modules/core/src/main/java/org/apache/ignite/events/BaselineChangedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/BaselineChangedEvent.java
index bbbeb74..6f3e634 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/BaselineChangedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/BaselineChangedEvent.java
@@ -83,7 +83,7 @@
         this.baselineNodes = baselineNodes;
     }
 
-    /** New baseline nodes. */
+    /** @return New baseline nodes. */
     public Collection<BaselineNode> baselineNodes() {
         //noinspection AssignmentOrReturnOfFieldWithMutableType
         return baselineNodes;
diff --git a/modules/core/src/main/java/org/apache/ignite/events/BaselineConfigurationChangedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/BaselineConfigurationChangedEvent.java
index c623014..725f43f 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/BaselineConfigurationChangedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/BaselineConfigurationChangedEvent.java
@@ -88,12 +88,12 @@
         this.autoAdjustTimeout = autoAdjustTimeout;
     }
 
-    /** Auto-adjust "enabled" flag value. */
+    /** @return Auto-adjust "enabled" flag value. */
     public boolean isAutoAdjustEnabled() {
         return autoAdjustEnabled;
     }
 
-    /** Auto-adjust timeout value in milliseconds. */
+    /** @return Auto-adjust timeout value in milliseconds. */
     public long autoAdjustTimeout() {
         return autoAdjustTimeout;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java
index 93f522b..27c070e 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheConsistencyViolationEvent.java
@@ -99,22 +99,22 @@
      */
     public interface EntryInfo {
         /**
-         * Value.
+         * @return Value.
          */
         public Object getValue();
 
         /**
-         * Version.
+         * @return Version.
          */
         public CacheEntryVersion getVersion();
 
         /**
-         * Located at the primary node.
+         * @return Located at the primary node.
          */
         public boolean isPrimary();
 
         /**
-         * Marked as correct during the fix.
+         * @return Marked as correct during the fix.
          */
         public boolean isCorrect();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
index e10ad1f..99e6ccd 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
@@ -167,6 +167,7 @@
      *      don't have it in deserialized form.
      * @param subjId Subject ID.
      * @param cloClsName Closure class name.
+     * @param taskName Name of the task if cache event was caused by an operation initiated within task execution.
      */
     public CacheEvent(String cacheName, ClusterNode node, @Nullable ClusterNode evtNode, String msg, int type, int part,
         boolean near, Object key, IgniteUuid xid, String txLbl, Object lockId, Object newVal, boolean hasNewVal,
@@ -228,6 +229,7 @@
     /**
      * Gets cache entry associated with event.
      *
+     * @param <K> Cache entry type.
      * @return Cache entry associated with event.
      */
     public <K> K key() {
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
index e19ed14..4475930 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
@@ -108,6 +108,8 @@
      * @param scanQryFilter Scan query filter.
      * @param args Query arguments.
      * @param subjId Security subject ID.
+     * @param contQryFilter Continuous query filter.
+     * @param taskName Name of the task if event was caused by an operation initiated within task execution.
      */
     public CacheQueryExecutedEvent(
         ClusterNode node,
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
index 2de1256..d6c0f12 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
@@ -126,6 +126,10 @@
      * @param key Key.
      * @param val Value.
      * @param oldVal Old value.
+     * @param qryType Type of the query.
+     * @param contQryFilter Continuous query filter.
+     * @param taskName Name of the task if event was caused by an operation initiated within task execution.
+     * @param row Result set read row.
      */
     public CacheQueryReadEvent(
         ClusterNode node,
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java b/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
index fff7aac..f0c59f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventAdapter.java
@@ -60,6 +60,7 @@
     /**
      * Creates event based with given parameters.
      *
+     * @param node Event initiator node.
      * @param msg Optional message.
      * @param type Event type.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/events/SnapshotEvent.java b/modules/core/src/main/java/org/apache/ignite/events/SnapshotEvent.java
index 20801ca..90b4631 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/SnapshotEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/SnapshotEvent.java
@@ -37,6 +37,7 @@
      * @param node Node on which the event was fired.
      * @param msg Optional event message.
      * @param snpName Snapshot name.
+     * @param type Snapshot event type.
      */
     public SnapshotEvent(ClusterNode node, String msg, String snpName, int type) {
         super(node, msg, type);
diff --git a/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java b/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
index 95f7fcb..b8e10b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
@@ -98,6 +98,8 @@
      * @param sesId Task session ID.
      * @param taskName Task name.
      * @param subjId Subject ID.
+     * @param internal Whether current task belongs to Ignite internal tasks.
+     * @param taskClsName Name ot the task class.
      */
     public TaskEvent(ClusterNode node, String msg, int type, IgniteUuid sesId, String taskName, String taskClsName,
         boolean internal, @Nullable UUID subjId) {
diff --git a/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java
index cf6e099..ec39a25 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java
@@ -47,7 +47,7 @@
     }
 
     /**
-     * Provides transaction proxy allows all 'get' operations such as {@link Transaction#label()}
+     * @return Transaction proxy allows all 'get' operations such as {@link Transaction#label()}
      * and also {@link Transaction#setRollbackOnly()} method.
      */
     public Transaction tx() {
diff --git a/modules/core/src/main/java/org/apache/ignite/failure/AbstractFailureHandler.java b/modules/core/src/main/java/org/apache/ignite/failure/AbstractFailureHandler.java
index 5e69161..1d6d45b 100644
--- a/modules/core/src/main/java/org/apache/ignite/failure/AbstractFailureHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/failure/AbstractFailureHandler.java
@@ -49,7 +49,7 @@
     }
 
     /**
-     * Returns unmodifiable set of ignored failure types.
+     * @return Unmodifiable set of ignored failure types.
      */
     public Set<FailureType> getIgnoredFailureTypes() {
         return ignoredFailureTypes;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
index 57d1e20..8572449 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
@@ -44,6 +44,7 @@
         this.igniteCacheCfg = igniteCacheCfg;
     }
 
+    /** {@inheritDoc} */
     @Override public IgniteConfiguration igniteConfiguration() {
         return ctx.config();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 23fd2f7..e1a22d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2700,7 +2700,6 @@
      * @param <V> Value type.
      * @return Internal cache instance.
      */
-    /*@java.test.only*/
     public <K, V> GridCacheAdapter<K, V> internalCache(String name) {
         CU.validateCacheName(name);
         checkClusterState();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
index c537f17..2796c03 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
@@ -379,6 +379,7 @@
         }
     }
 
+    /** */
     public @Nullable GridClientException lastError() {
         lock.readLock().lock();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientOperation.java
index 1abb51a..af5eaae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientOperation.java
@@ -23,67 +23,164 @@
 
 /** Operation codes. */
 enum ClientOperation {
-    /** Resource close. */RESOURCE_CLOSE(0),
+    /** Resource close. */
+    RESOURCE_CLOSE(0),
 
-    /** Cache get or create with name. */CACHE_GET_OR_CREATE_WITH_NAME(1052),
-    /** Cache put. */CACHE_PUT(1001),
-    /** Cache get. */CACHE_GET(1000),
-    /** Cache create with configuration. */CACHE_CREATE_WITH_CONFIGURATION(1053),
-    /** Cache get names. */CACHE_GET_NAMES(1050),
-    /** Cache destroy. */CACHE_DESTROY(1056),
-    /** Cache get or create with configuration. */CACHE_GET_OR_CREATE_WITH_CONFIGURATION(1054),
-    /** Cache create with name. */CACHE_CREATE_WITH_NAME(1051),
-    /** Cache contains key. */CACHE_CONTAINS_KEY(1011),
-    /** Cache contains keys. */CACHE_CONTAINS_KEYS(1012),
-    /** Cache get configuration. */CACHE_GET_CONFIGURATION(1055),
-    /** Get size. */CACHE_GET_SIZE(1020),
-    /** Put all. */CACHE_PUT_ALL(1004),
-    /** Get all. */CACHE_GET_ALL(1003),
-    /** Cache replace if equals. */CACHE_REPLACE_IF_EQUALS(1010),
-    /** Cache replace. */CACHE_REPLACE(1009),
-    /** Cache remove key. */CACHE_REMOVE_KEY(1016),
-    /** Cache remove if equals. */CACHE_REMOVE_IF_EQUALS(1017),
-    /** Cache remove keys. */CACHE_REMOVE_KEYS(1018),
-    /** Cache remove all. */CACHE_REMOVE_ALL(1019),
-    /** Cache get and put. */CACHE_GET_AND_PUT(1005),
-    /** Cache get and remove. */CACHE_GET_AND_REMOVE(1007),
-    /** Cache get and replace. */CACHE_GET_AND_REPLACE(1006),
-    /** Cache put if absent. */CACHE_PUT_IF_ABSENT(1002),
-    /** Cache get and put if absent. */CACHE_GET_AND_PUT_IF_ABSENT(1008),
-    /** Cache clear. */CACHE_CLEAR(1013),
-    /** Cache clear key. */CACHE_CLEAR_KEY(1014),
-    /** Cache clear keys. */CACHE_CLEAR_KEYS(1015),
-    /** Cache partitions. */CACHE_PARTITIONS(1101),
+    /** Cache get or create with name. */
+    CACHE_GET_OR_CREATE_WITH_NAME(1052),
 
-    /** Query scan. */QUERY_SCAN(2000),
-    /** Query scan cursor get page. */QUERY_SCAN_CURSOR_GET_PAGE(2001),
-    /** Query sql. */QUERY_SQL(2002),
-    /** Query sql cursor get page. */QUERY_SQL_CURSOR_GET_PAGE(2003),
-    /** Query sql fields. */QUERY_SQL_FIELDS(2004),
-    /** Query sql fields cursor get page. */QUERY_SQL_FIELDS_CURSOR_GET_PAGE(2005),
-    /** Continuous query. */QUERY_CONTINUOUS(2006),
-    /** Continuous query event. */QUERY_CONTINUOUS_EVENT(2007, ClientNotificationType.CONTINUOUS_QUERY_EVENT),
+    /** Cache put. */
+    CACHE_PUT(1001),
 
-    /** Get binary type. */GET_BINARY_TYPE(3002),
-    /** Register binary type name. */REGISTER_BINARY_TYPE_NAME(3001),
-    /** Put binary type. */PUT_BINARY_TYPE(3003),
-    /** Get binary type name. */GET_BINARY_TYPE_NAME(3000),
+    /** Cache get. */
+    CACHE_GET(1000),
 
-    /** Start new transaction. */TX_START(4000),
-    /** End the transaction (commit or rollback). */TX_END(4001),
+    /** Cache create with configuration. */
+    CACHE_CREATE_WITH_CONFIGURATION(1053),
 
-    /** Get cluster state. */CLUSTER_GET_STATE(5000),
-    /** Change cluster state. */CLUSTER_CHANGE_STATE(5001),
-    /** Get WAL state. */CLUSTER_GET_WAL_STATE(5003),
-    /** Change WAL state. */CLUSTER_CHANGE_WAL_STATE(5002),
-    /** Get nodes IDs by filter. */CLUSTER_GROUP_GET_NODE_IDS(5100),
-    /** Get nodes info by IDs. */CLUSTER_GROUP_GET_NODE_INFO(5101),
+    /** Cache get names. */
+    CACHE_GET_NAMES(1050),
 
-    /** Execute compute task. */COMPUTE_TASK_EXECUTE(6000),
-    /** Finished compute task notification. */COMPUTE_TASK_FINISHED(6001,
-        ClientNotificationType.COMPUTE_TASK_FINISHED),
+    /** Cache destroy. */
+    CACHE_DESTROY(1056),
 
-    /** Invoke service. */SERVICE_INVOKE(7000);
+    /** Cache get or create with configuration. */
+    CACHE_GET_OR_CREATE_WITH_CONFIGURATION(1054),
+
+    /** Cache create with name. */
+    CACHE_CREATE_WITH_NAME(1051),
+
+    /** Cache contains key. */
+    CACHE_CONTAINS_KEY(1011),
+
+    /** Cache contains keys. */
+    CACHE_CONTAINS_KEYS(1012),
+
+    /** Cache get configuration. */
+    CACHE_GET_CONFIGURATION(1055),
+
+    /** Get size. */
+    CACHE_GET_SIZE(1020),
+
+    /** Put all. */
+    CACHE_PUT_ALL(1004),
+
+    /** Get all. */
+    CACHE_GET_ALL(1003),
+
+    /** Cache replace if equals. */
+    CACHE_REPLACE_IF_EQUALS(1010),
+
+    /** Cache replace. */
+    CACHE_REPLACE(1009),
+
+    /** Cache remove key. */
+    CACHE_REMOVE_KEY(1016),
+
+    /** Cache remove if equals. */
+    CACHE_REMOVE_IF_EQUALS(1017),
+
+    /** Cache remove keys. */
+    CACHE_REMOVE_KEYS(1018),
+
+    /** Cache remove all. */
+    CACHE_REMOVE_ALL(1019),
+
+    /** Cache get and put. */
+    CACHE_GET_AND_PUT(1005),
+
+    /** Cache get and remove. */
+    CACHE_GET_AND_REMOVE(1007),
+
+    /** Cache get and replace. */
+    CACHE_GET_AND_REPLACE(1006),
+
+    /** Cache put if absent. */
+    CACHE_PUT_IF_ABSENT(1002),
+
+    /** Cache get and put if absent. */
+    CACHE_GET_AND_PUT_IF_ABSENT(1008),
+
+    /** Cache clear. */
+    CACHE_CLEAR(1013),
+
+    /** Cache clear key. */
+    CACHE_CLEAR_KEY(1014),
+
+    /** Cache clear keys. */
+    CACHE_CLEAR_KEYS(1015),
+
+    /** Cache partitions. */
+    CACHE_PARTITIONS(1101),
+
+    /** Query scan. */
+    QUERY_SCAN(2000),
+
+    /** Query scan cursor get page. */
+    QUERY_SCAN_CURSOR_GET_PAGE(2001),
+
+    /** Query sql. */
+    QUERY_SQL(2002),
+
+    /** Query sql cursor get page. */
+    QUERY_SQL_CURSOR_GET_PAGE(2003),
+
+    /** Query sql fields. */
+    QUERY_SQL_FIELDS(2004),
+
+    /** Query sql fields cursor get page. */
+    QUERY_SQL_FIELDS_CURSOR_GET_PAGE(2005),
+
+    /** Continuous query. */
+    QUERY_CONTINUOUS(2006),
+
+    /** Continuous query event. */
+    QUERY_CONTINUOUS_EVENT(2007, ClientNotificationType.CONTINUOUS_QUERY_EVENT),
+
+    /** Get binary type. */
+    GET_BINARY_TYPE(3002),
+
+    /** Register binary type name. */
+    REGISTER_BINARY_TYPE_NAME(3001),
+
+    /** Put binary type. */
+    PUT_BINARY_TYPE(3003),
+
+    /** Get binary type name. */
+    GET_BINARY_TYPE_NAME(3000),
+
+    /** Start new transaction. */
+    TX_START(4000),
+
+    /** End the transaction (commit or rollback). */
+    TX_END(4001),
+
+    /** Get cluster state. */
+    CLUSTER_GET_STATE(5000),
+
+    /** Change cluster state. */
+    CLUSTER_CHANGE_STATE(5001),
+
+    /** Get WAL state. */
+    CLUSTER_GET_WAL_STATE(5003),
+
+    /** Change WAL state. */
+    CLUSTER_CHANGE_WAL_STATE(5002),
+
+    /** Get nodes IDs by filter. */
+    CLUSTER_GROUP_GET_NODE_IDS(5100),
+
+    /** Get nodes info by IDs. */
+    CLUSTER_GROUP_GET_NODE_INFO(5101),
+
+    /** Execute compute task. */
+    COMPUTE_TASK_EXECUTE(6000),
+
+    /** Finished compute task notification. */
+    COMPUTE_TASK_FINISHED(6001, ClientNotificationType.COMPUTE_TASK_FINISHED),
+
+    /** Invoke service. */
+    SERVICE_INVOKE(7000);
 
     /** Code. */
     private final int code;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientSslUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientSslUtils.java
index 4f964d8..eb9cd60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientSslUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientSslUtils.java
@@ -47,6 +47,7 @@
 import static org.apache.ignite.ssl.SslContextFactory.DFLT_KEY_ALGORITHM;
 import static org.apache.ignite.ssl.SslContextFactory.DFLT_STORE_TYPE;
 
+/** */
 public class ClientSslUtils {
     /** */
     public static final char[] EMPTY_CHARS = new char[0];
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
index ad2b96d..c59374e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
@@ -749,37 +749,98 @@
 
     /** Thin client protocol cache configuration item codes. */
     private enum CfgItem {
-        /** Name. */NAME(0),
-        /** Cache mode. */CACHE_MODE(1),
-        /** Atomicity mode. */ATOMICITY_MODE(2),
-        /** Backups. */BACKUPS(3),
-        /** Write synchronization mode. */WRITE_SYNC_MODE(4),
-        /** Read from backup. */READ_FROM_BACKUP(6),
-        /** Eager ttl. */EAGER_TTL(405),
-        /** Group name. */GROUP_NAME(400),
-        /** Default lock timeout. */DEFAULT_LOCK_TIMEOUT(402),
-        /** Partition loss policy. */PART_LOSS_POLICY(404),
-        /** Rebalance batch size. */REBALANCE_BATCH_SIZE(303),
-        /** Rebalance batches prefetch count. */REBALANCE_BATCHES_PREFETCH_COUNT(304),
-        /** Rebalance delay. */REBALANCE_DELAY(301),
-        /** Rebalance mode. */REBALANCE_MODE(300),
-        /** Rebalance order. */REBALANCE_ORDER(305),
-        /** Rebalance throttle. */REBALANCE_THROTTLE(306),
-        /** Rebalance timeout. */REBALANCE_TIMEOUT(302),
-        /** Copy on read. */COPY_ON_READ(5),
-        /** Data region name. */DATA_REGION_NAME(100),
-        /** Stats enabled. */STATS_ENABLED(406),
-        /** Max async ops. */MAX_ASYNC_OPS(403),
-        /** Max query iterators. */MAX_QUERY_ITERATORS(206),
-        /** Onheap cache enabled. */ONHEAP_CACHE_ENABLED(101),
-        /** Query metric size. */QUERY_METRIC_SIZE(202),
-        /** Query parallelism. */QUERY_PARALLELISM(201),
-        /** Sql escape all. */SQL_ESCAPE_ALL(205),
-        /** Sql index max inline size. */SQL_IDX_MAX_INLINE_SIZE(204),
-        /** Sql schema. */SQL_SCHEMA(203),
-        /** Key configs. */KEY_CONFIGS(401),
-        /** Key entities. */QUERY_ENTITIES(200),
-        /** Expire policy. */EXPIRE_POLICY(407);
+        /** Name. */
+        NAME(0),
+
+        /** Cache mode. */
+        CACHE_MODE(1),
+
+        /** Atomicity mode. */
+        ATOMICITY_MODE(2),
+
+        /** Backups. */
+        BACKUPS(3),
+
+        /** Write synchronization mode. */
+        WRITE_SYNC_MODE(4),
+
+        /** Read from backup. */
+        READ_FROM_BACKUP(6),
+
+        /** Eager ttl. */
+        EAGER_TTL(405),
+
+        /** Group name. */
+        GROUP_NAME(400),
+
+        /** Default lock timeout. */
+        DEFAULT_LOCK_TIMEOUT(402),
+
+        /** Partition loss policy. */
+        PART_LOSS_POLICY(404),
+
+        /** Rebalance batch size. */
+        REBALANCE_BATCH_SIZE(303),
+
+        /** Rebalance batches prefetch count. */
+        REBALANCE_BATCHES_PREFETCH_COUNT(304),
+
+        /** Rebalance delay. */
+        REBALANCE_DELAY(301),
+
+        /** Rebalance mode. */
+        REBALANCE_MODE(300),
+
+        /** Rebalance order. */
+        REBALANCE_ORDER(305),
+
+        /** Rebalance throttle. */
+        REBALANCE_THROTTLE(306),
+
+        /** Rebalance timeout. */
+        REBALANCE_TIMEOUT(302),
+
+        /** Copy on read. */
+        COPY_ON_READ(5),
+
+        /** Data region name. */
+        DATA_REGION_NAME(100),
+
+        /** Stats enabled. */
+        STATS_ENABLED(406),
+
+        /** Max async ops. */
+        MAX_ASYNC_OPS(403),
+
+        /** Max query iterators. */
+        MAX_QUERY_ITERATORS(206),
+
+        /** Onheap cache enabled. */
+        ONHEAP_CACHE_ENABLED(101),
+
+        /** Query metric size. */
+        QUERY_METRIC_SIZE(202),
+
+        /** Query parallelism. */
+        QUERY_PARALLELISM(201),
+
+        /** Sql escape all. */
+        SQL_ESCAPE_ALL(205),
+
+        /** Sql index max inline size. */
+        SQL_IDX_MAX_INLINE_SIZE(204),
+
+        /** Sql schema. */
+        SQL_SCHEMA(203),
+
+        /** Key configs. */
+        KEY_CONFIGS(401),
+
+        /** Key entities. */
+        QUERY_ENTITIES(200),
+
+        /** Expire policy. */
+        EXPIRE_POLICY(407);
 
         /** Code. */
         private final short code;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
index 4782c59..1ecce71 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
@@ -66,6 +66,7 @@
     /** Connection. */
     private final JdbcConnection conn;
 
+    /** */
     private final JdbcMetadataInfo meta;
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index c055b04..6b4395b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -2465,6 +2465,7 @@
         }
     }
 
+    /** */
     public void addUserMessageListener(final @Nullable Object topic, final @Nullable IgniteBiPredicate<UUID, ?> p) {
         addUserMessageListener(topic, p, ctx.localNodeId());
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/JmxSystemViewExporterSpi.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/JmxSystemViewExporterSpi.java
index 8926fee..414effc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/JmxSystemViewExporterSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/JmxSystemViewExporterSpi.java
@@ -85,6 +85,7 @@
             unregBean(ignite, bean);
     }
 
+    /** */
     private void unregBean(Ignite ignite, ObjectName bean) {
         MBeanServer jmx = ignite.configuration().getMBeanServer();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java
index 0575b0f..e64a501 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java
@@ -33,5 +33,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Order {
+    /** */
     public int value() default 0;
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
index 42425c5..508ef01 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
@@ -1098,6 +1098,7 @@
         /** Fields. */
         private final List<FieldInfo> fields;
 
+        /** */
         private final Map<String, Integer> nameToIndex;
 
         /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
index 1a6abd7..3ed800a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
@@ -28,6 +28,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import sun.nio.ch.FileChannelImpl;
 
+/** */
 public class MappedFile implements Closeable, DirectMemoryRegion {
     /** */
     private static final Method map0 = U.findNonPublicMethod(FileChannelImpl.class, "map0", int.class, long.class, long.class);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java
index 5a1159a..ef63afc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MergeRecord.java
@@ -72,18 +72,22 @@
         return RecordType.BTREE_PAGE_MERGE;
     }
 
+    /** */
     public long parentId() {
         return prntId;
     }
 
+    /** */
     public int parentIndex() {
         return prntIdx;
     }
 
+    /** */
     public long rightId() {
         return rightId;
     }
 
+    /** */
     public boolean isEmptyBranch() {
         return emptyBranch;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
index 2c88257..cf75a10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java
@@ -61,10 +61,12 @@
         return RecordType.BTREE_EXISTING_PAGE_SPLIT;
     }
 
+    /** */
     public int middleIndex() {
         return mid;
     }
 
+    /** */
     public long forwardId() {
         return fwdId;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 5c45fff..706d7e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -2829,6 +2829,7 @@
         }
     }
 
+    /** */
     private CacheGroupNoAffOrFilteredHolder createHolder(
         GridCacheSharedContext cctx,
         CacheGroupDescriptor grpDesc,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java
index 7c7828a..3de2d4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java
@@ -886,10 +886,12 @@
         return totalPartitionsCnt;
     }
 
+    /** {@inheritDoc} */
     @Override public long getRebalancedKeys() {
         return rebalancedKeys;
     }
 
+    /** {@inheritDoc} */
     @Override public long getEstimatedRebalancingKeys() {
         return estimatedRebalancingKeys;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 8298749..90e2988 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5195,9 +5195,16 @@
 
     /** */
     protected enum BulkOperation {
+        /** */
         GET,
+
+        /** */
         PUT,
+
+        /** */
         INVOKE,
+
+        /** */
         REMOVE;
 
         /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
index a894d3f..083e7df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
@@ -672,6 +672,7 @@
         return null;
     }
 
+    /** */
     @Nullable private GridDeploymentInfoBean getDepBean(CachedDeploymentInfo<K, V> d) {
         if (d == null || cctx.discovery().node(d.senderId()) == null)
             // Sender has left.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 19f38a7..ed32121 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -3281,6 +3281,7 @@
         /** */
         private final CacheGroupContext grp;
 
+        /** */
         private MvccMarkUpdatedHandler(CacheGroupContext grp) {
             this.grp = grp;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
index 96d3b79..8ce04a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
@@ -223,10 +223,17 @@
 
     /** Query cursor state */
     protected enum State {
-        /** Idle. */ IDLE,
-        /** Executing. */ EXECUTING,
-        /** Execution completed. */ COMPLETED,
-        /** Closed. */CLOSED,
+        /** Idle. */
+        IDLE,
+
+        /** Executing. */
+        EXECUTING,
+
+        /** Execution completed. */
+        COMPLETED,
+
+        /** Closed. */
+        CLOSED,
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 2afdb2a..c81c751 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -467,6 +467,7 @@
             completeFuture(opRes0, err0, res.futureId());
     }
 
+    /** */
     private void waitAndRemap(AffinityTopologyVersion remapTopVer) {
         assert remapTopVer != null;
 
@@ -831,6 +832,7 @@
             checkDhtNodes(futId);
     }
 
+    /** */
     private void checkDhtNodes(long futId) {
         GridCacheReturn opRes0 = null;
         CachePartialUpdateCheckedException err0 = null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
index da3a7ea..16cc244 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
@@ -96,6 +96,7 @@
         }
     }
 
+    /** */
     private List<GridLongList> createAssigns(List<List<ClusterNode>> assign0) {
         if (assign0 != null) {
             List<GridLongList> assigns = new ArrayList<>(assign0.size());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java
index 60d145d..5946f6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java
@@ -106,6 +106,7 @@
             historicalParts = new HashSet<>(cp.historicalParts);
     }
 
+    /** */
     GridDhtPartitionDemandLegacyMessage(GridDhtPartitionDemandMessage cp) {
         grpId = cp.groupId();
         updateSeq = cp.rebalanceId() < 0 ? -1 : cp.rebalanceId();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 13a0bff..1f2d4c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -258,6 +258,7 @@
         return (flags & RECOVERY_FLAG_MASK) != 0;
     }
 
+    /** */
     public boolean addReaders() {
         return (flags & ADD_READER_FLAG_MASK) != 0;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java
index 88980f5..5e54952 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxAbstractEnlistFuture.java
@@ -415,14 +415,17 @@
         // No-op.
     }
 
+    /** {@inheritDoc} */
     @Override public GridCacheVersion version() {
         return lockVer;
     }
 
+    /** {@inheritDoc} */
     @Override public boolean onOwnerChanged(GridCacheEntryEx entry, GridCacheMvccCandidate owner) {
         return false;
     }
 
+    /** {@inheritDoc} */
     @Override public IgniteUuid futureId() {
         return futId;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 6e5b45b..332bb3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -5265,10 +5265,12 @@
 
     /** */
     private class MvccTxSnapshotFuture extends MvccSnapshotFuture {
+        /** {@inheritDoc} */
         @Override public void onResponse(MvccSnapshot res) {
             onResponse0(res, this);
         }
 
+        /** {@inheritDoc} */
         @Override public void onError(IgniteCheckedException err) {
             setRollbackOnly();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccLongList.java
index 8b580ed..c10c2b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccLongList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccLongList.java
@@ -21,9 +21,12 @@
  *
  */
 public interface MvccLongList {
+    /** */
     public int size();
 
+    /** */
     public long get(int i);
 
+    /** */
     public boolean contains(long val);
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
index fe16f54..9830bc4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUtils.java
@@ -120,7 +120,7 @@
     /**
      *
      */
-    private MvccUtils(){
+    private MvccUtils() {
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/PreviousQueries.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/PreviousQueries.java
index 414b997..65893fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/PreviousQueries.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/PreviousQueries.java
@@ -49,6 +49,7 @@
             return init && (cntrs == null || cntrs.stream().allMatch(l -> l < 0));
         }
 
+        /** {@inheritDoc} */
         @Override public String toString() {
             return S.toString(Node.class, this);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 770ceb6..2532ae5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -142,6 +142,7 @@
     /** @see #WAL_MARGIN_FOR_ATOMIC_CACHE_HISTORICAL_REBALANCE */
     public static final int DFLT_WAL_MARGIN_FOR_ATOMIC_CACHE_HISTORICAL_REBALANCE = 5;
 
+    /** */
     @SystemProperty(value = "The WAL iterator margin that is used to prevent partitions divergence on the historical " +
         "rebalance of atomic caches", type = Long.class,
         defaults = "" + DFLT_WAL_MARGIN_FOR_ATOMIC_CACHE_HISTORICAL_REBALANCE)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanImpl.java
index 1e3becb..502bf6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/DefragmentationMXBeanImpl.java
@@ -31,6 +31,7 @@
     /** Defragmentation manager. */
     private final IgniteDefragmentation defragmentation;
 
+    /** */
     public DefragmentationMXBeanImpl(GridKernalContext ctx) {
         this.defragmentation = ctx.defragmentation();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentation.java
index a5dc811..880ce96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentation.java
@@ -134,6 +134,7 @@
         /** */
         private final long totalElapsedTime;
 
+        /** */
         public DefragmentationStatus(
                 Map<String, CompletedDefragmentationInfo> completedCaches,
                 Map<String, InProgressDefragmentationInfo> inProgressCaches,
@@ -233,6 +234,7 @@
         /** */
         long elapsedTime;
 
+        /** */
         public DefragmentationInfo(long elapsedTime) {
             this.elapsedTime = elapsedTime;
         }
@@ -267,6 +269,7 @@
         /** */
         long sizeAfter;
 
+        /** */
         public CompletedDefragmentationInfo(long elapsedTime, long sizeBefore, long sizeAfter) {
             super(elapsedTime);
             this.sizeBefore = sizeBefore;
@@ -308,6 +311,7 @@
         /** */
         int totalPartitions;
 
+        /** */
         public InProgressDefragmentationInfo(long elapsedTime, int processedPartitions, int totalPartitions) {
             super(elapsedTime);
             this.processedPartitions = processedPartitions;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java
index 5c443ba..65b3e70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/IgniteDefragmentationImpl.java
@@ -42,6 +42,7 @@
     /** Kernal context. */
     private final GridKernalContext ctx;
 
+    /** */
     public IgniteDefragmentationImpl(GridKernalContext ctx) {
         this.ctx = ctx;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
index df4e75f..839b16e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
@@ -105,6 +105,7 @@
      *
      */
     private final class UpdateRowHandler extends PageHandler<T, Boolean> {
+        /** {@inheritDoc} */
         @Override public Boolean run(
             int cacheId,
             long pageId,
@@ -364,6 +365,7 @@
             this.maskPartId = maskPartId;
         }
 
+        /** {@inheritDoc} */
         @Override public Long run(
             int cacheId,
             long pageId,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index f96b33b..879ec66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -137,6 +137,7 @@
      *
      */
     private final class CutTail extends PageHandler<Void, Boolean> {
+        /** {@inheritDoc} */
         @Override public Boolean run(
             int cacheId,
             long pageId,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java
index 8ddd00a..2161027 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataCollectorTask.java
@@ -42,6 +42,7 @@
     /** Serial version uid. */
     private static final long serialVersionUID = 0L;
 
+    /** {@inheritDoc} */
     @Override public @NotNull Map<? extends ComputeJob, ClusterNode> map(
         List<ClusterNode> subgrid,
         @Nullable String snpName
@@ -63,6 +64,7 @@
         return map;
     }
 
+    /** {@inheritDoc} */
     @Override public @Nullable Map<ClusterNode, List<SnapshotMetadata>> reduce(
         List<ComputeJobResult> results
     ) throws IgniteException {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
index 3aed93e..a03c3ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
@@ -3260,6 +3260,7 @@
             return true;
         }
 
+        /** */
         Result init(long pageId, long page, long fwdId) throws IgniteCheckedException {
             // Init args.
             this.pageId = pageId;
@@ -3435,6 +3436,7 @@
             doVisit(this); // restart from last read row
         }
 
+        /** */
         private void unlock(long pageId, long page, long pageAddr) {
             if (writing) {
                 writeUnlock(pageId, page, pageAddr, dirty);
@@ -3445,6 +3447,7 @@
                 readUnlock(pageId, page, pageAddr);
         }
 
+        /** */
         private long lock(long pageId, long page) {
             if (writing = ((p.state() & TreeVisitorClosure.CAN_WRITE) != 0))
                 return writeLock(pageId, page);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index db10431..d37ddb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -152,7 +152,6 @@
      *
      * @return Internal cancelable future task for backup cleaner.
      */
-    /*@java.test.only*/
     protected GridTimeoutProcessor.CancelableTask getCancelableTask() {
         return cancelableTask;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 93ad5a8..11b2c04 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -2211,6 +2211,7 @@
             throw new IllegalStateException("Deserialized transaction can only be used as read-only.");
         }
 
+        /** {@inheritDoc} */
         @Override public byte ioPolicy() {
             throw new IllegalStateException("Deserialized transaction can only be used as read-only.");
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
index 868dca2..65887df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
@@ -192,6 +192,7 @@
 
         long startPageId = ((PageMemoryEx)pageMem).partitionMetaPageId(grp.groupId(), partId);
 
+        /** */
         final class DataPageScanCursor implements GridCursor<CacheDataRow> {
             /** */
             int pagesCnt = pageStore.pages();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccCacheIdAwareDataInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccCacheIdAwareDataInnerIO.java
index 32cd8ba..fa92214 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccCacheIdAwareDataInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/data/MvccCacheIdAwareDataInnerIO.java
@@ -62,6 +62,7 @@
         return PageUtils.getLong(pageAddr, offset(idx) + 24);
     }
 
+    /** {@inheritDoc} */
     @Override public int getMvccOperationCounter(long pageAddr, int idx) {
         return PageUtils.getInt(pageAddr, offset(idx) + 32);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ViewCacheClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ViewCacheClosure.java
index c7242a6..2b8a9b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ViewCacheClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ViewCacheClosure.java
@@ -55,6 +55,7 @@
     /** {@code true} to skip cache destroying. */
     private VisorViewCacheCmd cmd;
 
+    /** */
     @IgniteInstanceResource
     private Ignite ignite;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheLazyPlainVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheLazyPlainVersionedEntry.java
index 7cd7793..1949196 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheLazyPlainVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheLazyPlainVersionedEntry.java
@@ -65,6 +65,7 @@
         this.keepBinary = keepBinary;
     }
 
+    /** */
     public GridCacheLazyPlainVersionedEntry(GridCacheContext cctx,
         KeyCacheObject keyObj,
         CacheObject valObj,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index 32ed1d8..b78660e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -1757,6 +1757,7 @@
             // No-op.
         }
 
+        /** {@inheritDoc} */
         @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
             BinaryRawWriter rawWriter = writer.rawWriter();
 
@@ -1764,6 +1765,7 @@
             rawWriter.writeObject(arg);
         }
 
+        /** {@inheritDoc} */
         @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
             BinaryRawReader rawReader = reader.rawReader();
 
@@ -1856,10 +1858,12 @@
             // No-op.
         }
 
+        /** {@inheritDoc} */
         @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
             writer.rawWriter().writeObject(c);
         }
 
+        /** {@inheritDoc} */
         @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
             c = reader.rawReader().readObject();
         }
@@ -1943,10 +1947,12 @@
             // No-op.
         }
 
+        /** {@inheritDoc} */
         @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
             writer.rawWriter().writeObject(r);
         }
 
+        /** {@inheritDoc} */
         @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
             r = reader.rawReader().readObject();
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineAutoAdjustMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineAutoAdjustMXBeanImpl.java
index 6eacec8..bdea387 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineAutoAdjustMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/BaselineAutoAdjustMXBeanImpl.java
@@ -30,6 +30,7 @@
     /** */
     private final DistributedBaselineConfiguration baselineConfiguration;
 
+    /** */
     private final GridClusterStateProcessor state;
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresCacheKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresCacheKey.java
index 42d5b18..60de04b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresCacheKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresCacheKey.java
@@ -37,6 +37,7 @@
         return obj == this || (obj instanceof DataStructuresCacheKey);
     }
 
+    /** {@inheritDoc} */
     @Override public String toString() {
         return "DataStructuresCacheKey []";
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
index 17e737f..bb2d6d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
@@ -488,10 +488,12 @@
 
         // Methods relayed from outer class
 
+        /** */
         final int getHoldCount() {
             return isHeldExclusively() ? getState() : 0;
         }
 
+        /** */
         final boolean isLocked() throws IgniteCheckedException {
             return getState() != 0 || cacheView.get(key).get() != 0;
         }
@@ -805,6 +807,7 @@
             }
         }
 
+        /** */
         synchronized boolean checkIncomingSignals(GridCacheLockState state) {
             if (state.getSignals() == null)
                 return false;
@@ -1269,6 +1272,7 @@
         }
     }
 
+    /** */
     @NotNull @Override public Condition newCondition() {
         throw new UnsupportedOperationException("IgniteLock does not allow creation of nameless conditions. ");
     }
@@ -1388,6 +1392,7 @@
         }
     }
 
+    /** */
     @Override public boolean isFailoverSafe() {
         try {
             initializeReentrantLock();
@@ -1399,6 +1404,7 @@
         }
     }
 
+    /** */
     @Override public boolean isFair() {
         try {
             initializeReentrantLock();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
index ce794ae..de55994 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
@@ -108,6 +108,7 @@
         /** Flag indicating that a node failed and it is not safe to continue using this semaphore. */
         protected boolean broken = false;
 
+        /** */
         protected Sync(int permits, Map<UUID, Integer> waiters, boolean failoverSafe) {
             setState(permits);
             nodeMap = waiters;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
index f1176d6..45b4146 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
@@ -29,6 +29,7 @@
 import org.apache.ignite.plugin.extensions.communication.MessageReader;
 import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
+/** */
 @IgniteCodeGeneratingFail
 public class ClientMessage implements Message, Externalizable {
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
index e94ff5d..ef0b2d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
@@ -28,7 +28,7 @@
  * Extended platform configuration.
  */
 public interface PlatformConfigurationEx {
-    /*
+    /**
      * @return Native gateway.
      */
     public PlatformCallbackGateway gate();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
index c6bde3a..29622a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
@@ -29,6 +29,7 @@
  * No-op processor.
  */
 public class PlatformNoopProcessor extends GridProcessorAdapter implements PlatformProcessor {
+    /** */
     public PlatformNoopProcessor(GridKernalContext ctx) {
         super(ctx);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryProxy.java
index 1c28600..acf1aa7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryProxy.java
@@ -26,6 +26,7 @@
  * Proxy that implements PlatformTarget.
  */
 public class PlatformContinuousQueryProxy extends PlatformAbstractTarget {
+    /** */
     private final PlatformContinuousQuery qry;
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetBootstrap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetBootstrap.java
index 1e66254..4ead5db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetBootstrap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetBootstrap.java
@@ -26,6 +26,7 @@
  * Interop .Net bootstrap.
  */
 public class PlatformDotNetBootstrap extends PlatformAbstractBootstrap {
+    /** */
     private boolean useLogger;
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java
index dab238f8..54ace50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheBean.java
@@ -42,9 +42,11 @@
      */
     private String sqlSchema;
 
+    /** */
     public GridClientCacheBean() {
     }
 
+    /** */
     public GridClientCacheBean(String name, GridClientCacheMode mode, String sqlSchema) {
         this.name = name;
         this.mode = mode;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java
index b3de271..fb03b06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java
@@ -23,6 +23,7 @@
 import java.util.Objects;
 import org.apache.ignite.internal.util.typedef.internal.S;
 
+/** */
 public class GridClientWarmUpRequest extends GridClientNodeStateBeforeStartRequest {
     /** Serial version uid. */
     private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/NoopSpan.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/NoopSpan.java
index b1eaa2a..dcbc431 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/NoopSpan.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/NoopSpan.java
@@ -33,7 +33,7 @@
     /**
      * Constructor.
      */
-    private NoopSpan(){
+    private NoopSpan() {
 
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/SpanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/SpanImpl.java
index bf98b79..4df5cfd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/SpanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/tracing/SpanImpl.java
@@ -52,12 +52,14 @@
         this.includedScopes = includedScopes;
     }
 
+    /** {@inheritDoc} */
     @Override public Span addTag(String tagName, Supplier<String> tagValSupplier) {
         spiSpecificSpan.addTag(tagName, tagValSupplier.get());
 
         return this;
     }
 
+    /** {@inheritDoc} */
     @Override public Span addLog(Supplier<String> logDescSupplier) {
         spiSpecificSpan.addLog(logDescSupplier.get());
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java
index e26016f..432b20c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanMap.java
@@ -274,6 +274,7 @@
      * Entry set.
      */
     private class EntrySet extends AbstractSet<Entry<K, V>> {
+        /** {@inheritDoc} */
         @Override public Iterator<Entry<K, V>> iterator() {
             return new Iterator<Entry<K, V>>() {
                 /** */
@@ -345,6 +346,7 @@
             };
         }
 
+        /** {@inheritDoc} */
         @Override public int size() {
             return GridLeanMap.this.size();
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
index 27fe9da..3061ba5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
@@ -265,6 +265,7 @@
     private enum LogLevel {
         /** Error level. */
         ERROR {
+            /** {@inheritDoc} */
             @Override public void doLog(IgniteLogger log, String msg, Throwable e, boolean quiet) {
                 if (e != null)
                     U.error(log, msg, e);
@@ -275,6 +276,7 @@
 
         /** Warn level. */
         WARN {
+            /** {@inheritDoc} */
             @Override public void doLog(IgniteLogger log, String msg, Throwable e, boolean quiet) {
                 if (quiet)
                     U.quietAndWarn(log, msg, e);
@@ -285,6 +287,7 @@
 
         /** Info level. */
         INFO {
+            /** {@inheritDoc} */
             @Override public void doLog(IgniteLogger log, String msg, Throwable e, boolean quiet) {
                 if (quiet)
                     U.quietAndInfo(log, msg);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
index 8b526dc..1c1894f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
@@ -32,24 +32,34 @@
  */
 @SuppressWarnings("ALL")
 public class GridReversedLinesFileReader implements Closeable {
+    /** */
     private final int blockSize;
 
+    /** */
     private final Charset encoding;
 
+    /** */
     private final RandomAccessFile randomAccessFile;
 
+    /** */
     private final long totalByteLength;
 
+    /** */
     private final long totalBlockCount;
 
+    /** */
     private final byte[][] newLineSequences;
 
+    /** */
     private final int avoidNewlineSplitBufferSize;
 
+    /** */
     private final int byteDecrement;
 
+    /** */
     private FilePart currentFilePart;
 
+    /** */
     private boolean trailingNewlineOfFileSkipped = false;
 
     /**
@@ -181,13 +191,18 @@
         randomAccessFile.close();
     }
 
+    /** */
     private class FilePart {
+        /** */
         private final long no;
 
+        /** */
         private final byte[] data;
 
+        /** */
         private byte[] leftOver;
 
+        /** */
         private int currentLastBytePos;
 
         /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/SBLengthLimit.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/SBLengthLimit.java
index 3906bb8..883b910 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/SBLengthLimit.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/SBLengthLimit.java
@@ -71,6 +71,7 @@
         }
     }
 
+    /** */
     CircularStringBuilder getTail() {
         return new CircularStringBuilder(TAIL_LEN);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTask.java
index fed8aa9..1a286ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTask.java
@@ -41,6 +41,7 @@
 import org.apache.ignite.internal.visor.VisorTaskArgument;
 import org.jetbrains.annotations.Nullable;
 
+/** */
 @GridInternal
 public class VisorPageLocksTask
     extends VisorMultiNodeTask<VisorPageLocksTrackerArgs, Map<ClusterNode, VisorPageLocksResult>, VisorPageLocksResult> {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java
index b98672f..7b6cf31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java
@@ -39,6 +39,7 @@
         return new IdAndTagViewJob(arg, debug);
     }
 
+    /** */
     private static class IdAndTagViewJob extends VisorJob<Void, VisorIdAndTagViewTaskResult> {
         /** */
         private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorClientConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorClientConnectorConfiguration.java
index 020a9be..22704ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorClientConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorClientConnectorConfiguration.java
@@ -226,6 +226,7 @@
         return sslCtxFactory;
     }
 
+    /** {@inheritDoc} */
     @Override public byte getProtocolVersion() {
         return V2;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java
index 160b0fc..76d2d94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java
@@ -402,6 +402,7 @@
         return walCompactionEnabled;
     }
 
+    /** {@inheritDoc} */
     @Override public byte getProtocolVersion() {
         return V2;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
index 823126d..6b53a10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
@@ -65,6 +65,7 @@
     /** */
     private static final String BACKUP_FOLDER_PREFIX = "backup_";
 
+    /** {@inheritDoc} */
     @Override protected VisorJob<PersistenceTaskArg, PersistenceTaskResult> job(PersistenceTaskArg arg) {
         return new PersistenceJob(arg, debug);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskResult.java
index 5a0a0fe..6c19b62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskResult.java
@@ -27,6 +27,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
 
+/** */
 public class PersistenceTaskResult extends IgniteDataTransferObject {
     /** */
     private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java
index 4b7bfc9..f43ff13 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupport.java
@@ -73,6 +73,7 @@
     /**
      * Gets and resets future for previous asynchronous operation.
      *
+     * @param <R> Type of the future result.
      * @return Future for previous asynchronous operation.
      *
      * @deprecated since 2.0. Please use new specialized async method
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index d97aa85..2e03f5d 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -116,6 +116,7 @@
      * It is guaranteed that done callback will be called only ONCE.
      *
      * @param doneCb Done callback that is applied to this future when it finishes to produce chained future result.
+     * @param <T> Type of the converted result.
      * @return Chained future that finishes after this future completes and done callback is called.
      */
     public <T> IgniteFuture<T> chain(IgniteClosure<? super IgniteFuture<V>, T> doneCb);
@@ -126,6 +127,7 @@
      *
      * @param doneCb Done callback that is applied to this future when it finishes to produce chained future result.
      * @param exec Executor to run done callback. Cannot be {@code null}.
+     * @param <T> Type of the converted result.
      * @return Chained future that finishes after this future completes and done callback is called.
      */
     public <T> IgniteFuture<T> chainAsync(IgniteClosure<? super IgniteFuture<V>, T> doneCb, Executor exec);
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProducer.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProducer.java
index d74517f..b61f393 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProducer.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProducer.java
@@ -27,7 +27,7 @@
 @FunctionalInterface
 public interface IgniteProducer<T> {
     /**
-     * Produce value.
+     * @return Produced value.
      */
     public T produce() throws IgniteCheckedException;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java
index 5560e43..ee7bc59 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLoggerFileHandler.java
@@ -78,6 +78,7 @@
      * Sets Node id and instantiates {@link FileHandler} delegate.
      *
      * @param nodeId Node id.
+     * @param workDir param.
      */
     public void nodeId(UUID nodeId, String workDir) throws IgniteCheckedException, IOException {
         nodeId(null, nodeId, workDir);
@@ -87,6 +88,7 @@
      * Sets Node id and instantiates {@link FileHandler} delegate.
      *
      * @param app Application name.
+     * @param workDir Path to the work directory.
      * @param nodeId Node id.
      */
     public void nodeId(@Nullable String app, UUID nodeId, String workDir) throws IgniteCheckedException, IOException {
diff --git a/modules/core/src/main/java/org/apache/ignite/maintenance/MaintenanceAction.java b/modules/core/src/main/java/org/apache/ignite/maintenance/MaintenanceAction.java
index 381c660..49bceb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/maintenance/MaintenanceAction.java
+++ b/modules/core/src/main/java/org/apache/ignite/maintenance/MaintenanceAction.java
@@ -36,17 +36,21 @@
  */
 @IgniteExperimental
 public interface MaintenanceAction<T> {
-    /** Executes operations of current maintenance action and returns results. */
+    /**
+     * Executes operations of current maintenance action.
+     *
+     * @return Result of the maintenance action.
+     */
     public T execute();
 
     /**
-     * Mandatory human-readable name of maintenance action.
+     * @return Mandatory human-readable name of maintenance action.
      * All actions of single {@link MaintenanceWorkflowCallback} should have unique names.
      */
     @NotNull public String name();
 
     /**
-     * Optional user-readable description of maintenance action.
+     * @return Optional user-readable description of maintenance action.
      */
     @Nullable public String description();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
index 9c11461..81ee7fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java
@@ -53,6 +53,10 @@
      * Same as {@link MarshallerContext#registerClassName(byte, int, java.lang.String, boolean)} but with shortened
      * parameters list.
      *
+     * @param platformId ID of a platform (java, .NET, etc.) to register mapping for.
+     * @param typeId Type ID.
+     * @param clsName Class name.
+     * @return {@code True} if mapping was registered successfully.
      * @deprecated Use {@link MarshallerContext#registerClassName(byte, int, java.lang.String, boolean)} instead.
      *      This particular method will be deleted in future releases.
      */
@@ -117,7 +121,7 @@
     public IgnitePredicate<String> classNameFilter();
 
     /**
-     * Returns JDK marshaller instance.
+     * @return  JDK marshaller instance.
      */
     public JdkMarshaller jdkMarshaller();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
index 9568b71..6f7faf9 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
@@ -125,6 +125,7 @@
     /**
      * Returns class name filter for marshaller.
      *
+     * @param clsLdr Class loader.
      * @return Class name filter for marshaller.
      */
     public static IgnitePredicate<String> classNameFilter(ClassLoader clsLdr) throws IgniteCheckedException {
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/BaselineAutoAdjustMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/BaselineAutoAdjustMXBean.java
index 468eb5e..11bdff6 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/BaselineAutoAdjustMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/BaselineAutoAdjustMXBean.java
@@ -23,29 +23,29 @@
  * This interface defines JMX view on {@link DistributedBaselineConfiguration}.
  */
 public interface BaselineAutoAdjustMXBean {
-    /** */
+    /** @return Whether baseline autoadjustment is enabled ot not. */
     @MXBeanDescription("Whether baseline autoadjustment is enabled ot not.")
     boolean isAutoAdjustmentEnabled();
 
-    /** */
+    /** @return Baseline autoadjustment timeout value. */
     @MXBeanDescription("Baseline autoadjustment timeout value.")
     long getAutoAdjustmentTimeout();
 
-    /** */
+    /** @return Time until baseline will be adjusted automatically. */
     @MXBeanDescription("Time until baseline will be adjusted automatically.")
     long getTimeUntilAutoAdjust();
 
-    /** */
+    /** @return State of task of auto-adjust. */
     @MXBeanDescription("State of task of auto-adjust(IN_PROGRESS, SCHEDULED, NOT_SCHEDULED).")
     String getTaskState();
 
-    /** */
+    /** @param enabled Enable/disable baseline autoadjustment flag. */
     @MXBeanDescription("Enable/disable baseline autoadjustment feature.")
     public void setAutoAdjustmentEnabled(
         @MXBeanParameter(name = "enabled", description = "Enable/disable flag.") boolean enabled
     );
 
-    /** */
+    /** @param timeout Timeout value. */
     @MXBeanDescription("Set baseline autoadjustment timeout value.")
     public void setAutoAdjustmentTimeout(
         @MXBeanParameter(name = "timeout", description = "Timeout value.") long timeout
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheGroupMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheGroupMetricsMXBean.java
index 1275083..af3b69a 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheGroupMetricsMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheGroupMetricsMXBean.java
@@ -167,37 +167,37 @@
     public Map<Integer, List<String>> getAffinityPartitionsAssignmentMap();
 
     /**
-     * Cache group type.
+     * @return Cache group type.
      */
     @MXBeanDescription("Cache group type.")
     public String getType();
 
     /**
-     * Local partition ids.
+     * @return Local partition ids..
      */
     @MXBeanDescription("Local partition ids.")
     public List<Integer> getPartitionIds();
 
     /**
-     * Cache group total allocated pages.
+     * @return Cache group total allocated pages.
      */
     @MXBeanDescription("Cache group total allocated pages.")
     public long getTotalAllocatedPages();
 
     /**
-     * Total size of memory allocated for group, in bytes.
+     * @return Total size of memory allocated for group, in bytes.
      */
     @MXBeanDescription("Total size of memory allocated for group, in bytes.")
     public long getTotalAllocatedSize();
 
     /**
-     * Storage space allocated for group, in bytes.
+     * @return Storage space allocated for group, in bytes.
      */
     @MXBeanDescription("Storage space allocated for group, in bytes.")
     public long getStorageSize();
 
     /**
-     * Storage space allocated for group adjusted for possible sparsity, in bytes.
+     * @return Storage space allocated for group adjusted for possible sparsity, in bytes.
      */
     @MXBeanDescription("Storage space allocated for group adjusted for possible sparsity, in bytes.")
     public long getSparseStorageSize();
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java
index e1355f7..b305174 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterMetricsMXBean.java
@@ -302,14 +302,14 @@
     public long getTopologyVersion();
 
     /**
-     * Get distinct attribute names for given nodes projection.
+     * @return Distinct attribute names for given nodes projection.
      */
     @MXBeanDescription("Distinct attribute names for given nodes projection.")
     public Set<String> attributeNames();
 
 
     /**
-     * Get distinct attribute values for given nodes projection.
+     * @return Distinct attribute values for given nodes projection.
      *
      * @param attrName Attribute name.
      */
@@ -319,12 +319,11 @@
     );
 
      /**
-      * Get node IDs with the given attribute value.
-      *
       * @param attrName Attribute name.
       * @param attrVal Attribute value.
       * @param includeSrvs Include server nodes.
       * @param includeClients Include client nodes.
+      * @return Node IDs with the given attribute value.
       */
      @MXBeanDescription("Get node IDs with the given attribute value.")
      public Set<UUID> nodeIdsForAttribute(
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/DataStorageMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/DataStorageMXBean.java
index 4149d91..c1b0140 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/DataStorageMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/DataStorageMXBean.java
@@ -23,6 +23,7 @@
  * An MX bean allowing to monitor and tune persistence.
  */
 public interface DataStorageMXBean {
+    /** @return ZIP compression level to WAL compaction. */
     @MXBeanDescription("ZIP compression level to WAL compaction.")
     int getWalCompactionLevel();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/FailureHandlingMxBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/FailureHandlingMxBean.java
index 199d752..d366629 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/FailureHandlingMxBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/FailureHandlingMxBean.java
@@ -22,26 +22,26 @@
  */
 @MXBeanDescription("MBean that controls critical failure handling.")
 public interface FailureHandlingMxBean {
-    /** */
+    /** @return Whether critical workers liveness checking is enabled. */
     @MXBeanDescription("Enable/disable critical workers liveness checking.")
     public boolean getLivenessCheckEnabled();
 
-    /** */
+    /** @param val Whether critical workers liveness checking is enabled. */
     public void setLivenessCheckEnabled(boolean val);
 
-    /** */
+    /** @return Maximum inactivity period for system worker. Negative value denotes infinite timeout. */
     @MXBeanDescription("Maximum inactivity period for system worker. Critical failure handler fires if exceeded. " +
         "Nonpositive value denotes infinite timeout.")
     public long getSystemWorkerBlockedTimeout();
 
-    /** */
+    /** @param val Maximum inactivity period for system worker. Negative value denotes infinite timeout. */
     public void setSystemWorkerBlockedTimeout(long val);
 
-    /** */
+    /** @return Timeout for checkpoint read lock acquisition. Negative value denotes infinite timeout. */
     @MXBeanDescription("Timeout for checkpoint read lock acquisition. Critical failure handler fires if exceeded. " +
         "Nonpositive value denotes infinite timeout.")
     public long getCheckpointReadLockTimeout();
 
-    /** */
+    /** @param val Timeout for checkpoint read lock acquisition. Negative value denotes infinite timeout. */
     public void setCheckpointReadLockTimeout(long val);
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
index 0701100..cfdde45 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
@@ -31,8 +31,7 @@
 @Target({ElementType.TYPE, ElementType.METHOD})
 public @interface MXBeanDescription {
     /**
-     *
-     * Description for Mbean.
+     * @return Description for Mbean.
      */
     public String value();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParameter.java b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParameter.java
index 56f1218..192558a 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParameter.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParameter.java
@@ -31,12 +31,12 @@
 @Target({ElementType.PARAMETER})
 public @interface MXBeanParameter {
     /**
-     * Parameter name.
+     * @return Parameter name.
      */
     String name();
 
     /**
-     * Parameter description.
+     * @return Parameter description.
      */
     String description();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
index 2786253..34dd157 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
@@ -35,7 +35,7 @@
 public @interface MXBeanParametersDescriptions {
     /**
      *
-     * Array of descriptions for parameters.
+     * @return Array of descriptions for parameters.
      */
     public String[] value();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
index 22ac7c0..4b4aa3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
@@ -34,8 +34,7 @@
 @Target({ElementType.METHOD})
 public @interface MXBeanParametersNames {
     /**
-     *
-     * Array of parameter names in MBean.
+     * @return Array of parameter names in MBean.
      */
     public String[] value();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/QueryMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/QueryMXBean.java
index f3d5deb..6334c46 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/QueryMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/QueryMXBean.java
@@ -29,6 +29,7 @@
      * Kills continuous query by the identifier.
      *
      * @param routineId Continuous query id.
+     * @param originNodeId ID of the node that is CQ initiator.
      * @see ContinuousQueryView#routineId()
      */
     @MXBeanDescription("Kills continuous query by the identifier.")
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/TransactionsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/TransactionsMXBean.java
index e6f322a..e9e65f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/TransactionsMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/TransactionsMXBean.java
@@ -36,6 +36,7 @@
      * @param order Order.
      * @param detailed Detailed.
      * @param kill Kill.
+     * @return If {@code detailed} flag is set - description of each transaction, else transactions count.
      */
     @MXBeanDescription("Returns or kills transactions matching the filter conditions.")
     public String getActiveTransactions(
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/PlatformServiceMethod.java b/modules/core/src/main/java/org/apache/ignite/platform/PlatformServiceMethod.java
index 7e90cb6..65f8935 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/PlatformServiceMethod.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/PlatformServiceMethod.java
@@ -42,7 +42,7 @@
 @Target({ElementType.METHOD})
 public @interface PlatformServiceMethod {
     /**
-     * Method name in corresponding platform service.
+     * @return Method name in corresponding platform service.
      */
     String value();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
index 7c4c348..5334822 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
@@ -60,6 +60,7 @@
 
     /**
      * @param cls Ignite component class.
+     * @param <T> Type of the component to create.
      * @return Ignite component or {@code null} if component is not supported.
      */
     @Nullable public <T> T createComponent(Class<T> cls);
@@ -69,6 +70,9 @@
      *
      * @param entry Mutable entry to unwrap.
      * @param cls Type of the expected component.
+     * @param <T> Type of the object cache entry be unwrapped to.
+     * @param <V> Cache entry value type.
+     * @param <K> Cache entry key type.
      * @return New instance of underlying type or {@code null} if it's not available.
      */
     @Nullable public <T, K, V> T unwrapCacheEntry(Cache.Entry<K, V> entry, Class<T> cls);
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
index 1be1ec3..46ca419 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
@@ -56,6 +56,7 @@
     public String copyright();
 
     /**
+     * @param <T> Type of the plugin.
      * @return Plugin API.
      */
     public <T extends IgnitePlugin> T plugin();
@@ -73,6 +74,7 @@
      *
      * @param ctx Plugin context.
      * @param cls Ignite component class.
+     * @param <T> Ignite component type.
      * @return Ignite component or {@code null} if component is not supported.
      */
     @Nullable public <T> T createComponent(PluginContext ctx, Class<T> cls);
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
index 6feee1a..505ed2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java
@@ -242,6 +242,7 @@
      * Reads nested message.
      *
      * @param name Field name.
+     * @param <T> Type of the message.
      * @return Message.
      */
     public <T extends Message> T readMessage(String name);
@@ -252,6 +253,7 @@
      * @param name Field name.
      * @param itemType Array component type.
      * @param itemCls Array component class.
+     * @param <T> Type of the red object .
      * @return Array of objects.
      */
     public <T> T[] readObjectArray(String name, MessageCollectionItemType itemType, Class<T> itemCls);
@@ -261,6 +263,7 @@
      *
      * @param name Field name.
      * @param itemType Collection item type.
+     * @param <C> Type of the red collection.
      * @return Collection.
      */
     public <C extends Collection<?>> C readCollection(String name, MessageCollectionItemType itemType);
@@ -272,6 +275,7 @@
      * @param keyType Map key type.
      * @param valType Map value type.
      * @param linked Whether {@link LinkedHashMap} should be created.
+     * @param <M> Type of the red map.
      * @return Map.
      */
     public <M extends Map<?, ?>> M readMap(String name, MessageCollectionItemType keyType,
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
index 14d4417b..9199c7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
@@ -279,6 +279,7 @@
      * @param name Field name.
      * @param arr Array of objects.
      * @param itemType Array component type.
+     * @param <T> Type of the objects that array contains.
      * @return Whether array was fully written.
      */
     public <T> boolean writeObjectArray(String name, T[] arr, MessageCollectionItemType itemType);
@@ -289,6 +290,7 @@
      * @param name Field name.
      * @param col Collection.
      * @param itemType Collection item type.
+     * @param <T> Type of the objects that collection contains.
      * @return Whether value was fully written.
      */
     public <T> boolean writeCollection(String name, Collection<T> col, MessageCollectionItemType itemType);
@@ -300,6 +302,8 @@
      * @param map Map.
      * @param keyType Map key type.
      * @param valType Map value type.
+     * @param <K> Initial key types of the map to write.
+     * @param <V> Initial value types of the map to write.
      * @return Whether value was fully written.
      */
     public <K, V> boolean writeMap(String name, Map<K, V> map, MessageCollectionItemType keyType,
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
index df20f3f..33bcfa8 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
@@ -150,6 +150,7 @@
     /**
      * Set client SSL certificates.
      * @param certs Client SSL certificates.
+     * @return {@code this} for chaining.
      */
     public AuthenticationContext certificates(Certificate[] certs) {
         this.certs = certs;
@@ -166,6 +167,9 @@
 
     /**
      * Sets flag indicating if this is client node context.
+     *
+     * @param newVal Whether current authentication context relates to client node connection.
+     * @return {@code this} for chaining.
      */
     public AuthenticationContext setClient(boolean newVal) {
         client = newVal;
diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
index 945ed20..1ba64a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceContext.java
@@ -61,6 +61,7 @@
      * Gets affinity key used for key-to-node affinity calculation. This parameter is optional
      * and is set only when key-affinity service was deployed.
      *
+     * @param <K> Affinity key type.
      * @return Affinity key, possibly {@code null}.
      */
     @Nullable public <K> K affinityKey();
diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
index d4cb361..7fd5922 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceDescriptor.java
@@ -69,6 +69,7 @@
      * Gets affinity key used for key-to-node affinity calculation. This parameter is optional
      * and is set only when key-affinity service was deployed.
      *
+     * @param <K> Affinity key type.
      * @return Affinity key, possibly {@code null}.
      */
     @Nullable public <K> K affinityKey();
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
index 3c27736..99c1e23 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
@@ -34,7 +34,7 @@
 @Target(ElementType.METHOD)
 public @interface IgniteSpiConfiguration {
     /**
-     * Whether this configuration setting is optional or not.
+     * @return Whether this configuration setting is optional or not.
      */
     public boolean optional();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
index e5994cb..ab1bddc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConsistencyChecked.java
@@ -37,6 +37,8 @@
     /**
      * Optional consistency check means that check will be performed only if
      * SPI class names and versions match.
+     *
+     * @return Whether check will be performed only if SPI class names and versions match.
      */
     public boolean optional();
 
@@ -44,6 +46,8 @@
      * If false, skip consistency checks for client cluster nodes. Could be useful
      * for SwapSpaceSpi for example, since client nodes has no data at all, so they
      * don't need to be consistent with server nodes.
+     *
+     * @return Whether perform consistency checks for client cluster nodes.
      */
     public boolean checkClient() default true;
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
index e835b10..6b440ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
@@ -224,6 +224,8 @@
      *
      * @param cacheName Cache name.
      * @param key Object key.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return Cached object.
      * @throws CacheException Thrown if any exception occurs.
      */
@@ -301,6 +303,7 @@
     /**
      * @param node Node.
      * @param discoData Disco data.
+     * @return Validation result or {@code null} in case of success.
      */
     @Nullable public IgniteNodeValidationResult validateNode(ClusterNode node, DiscoveryDataBag discoData);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
index cb48a93..32be695 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiMultipleInstancesSupport.java
@@ -39,7 +39,7 @@
 @Target({ElementType.TYPE})
 public @interface IgniteSpiMultipleInstancesSupport {
     /**
-     * Whether or not target SPI supports multiple grid instances
+     * @return Whether or not target SPI supports multiple grid instances
      * started in the same VM.
      */
     public boolean value();
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/TimeoutStrategy.java b/modules/core/src/main/java/org/apache/ignite/spi/TimeoutStrategy.java
index d5bfcfb..b6659c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/TimeoutStrategy.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/TimeoutStrategy.java
@@ -24,6 +24,7 @@
     /**
      * Get next timeout based on previously timeout calculated by strategy.
      *
+     * @param currTimeout Current timeout value that is used to calculate the next one.
      * @return Gets next timeout.
      * @throws IgniteSpiOperationTimeoutException in case of total timeout already breached.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
index 1b5ff70..0c9f9b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
@@ -397,7 +397,7 @@
      * @param pwd Checkpoint database password to set. {@code null} is a valid value that means that no password
      *      provided. Authentication won't be performed in this case.
      * @see #setUser(String)
-     ** @return {@code this} for chaining.
+     * @return {@code this} for chaining.
      */
     @IgniteSpiConfiguration(optional = true)
     public JdbcCheckpointSpi setPwd(String pwd) {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
index 34d5c2f..b02a935 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
@@ -308,6 +308,7 @@
      * Sets number of jobs that can be executed in parallel.
      *
      * @param activeJobsThreshold Number of jobs that can be executed in parallel.
+     * @return {@code this} for chaining.
      */
     @IgniteSpiConfiguration(optional = true)
     public JobStealingCollisionSpi setActiveJobsThreshold(int activeJobsThreshold) {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
index 994aa96..d4247e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
@@ -313,7 +313,7 @@
         return runningCnt + heldCnt;
     }
 
-    /*
+    /**
      * Gets number of currently running (not {@code 'held}) jobs.
      *
      * @return Number of currently running (not {@code 'held}) jobs.
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/AttributeNames.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/AttributeNames.java
index 96de0ae..62b57fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/AttributeNames.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/AttributeNames.java
@@ -44,6 +44,7 @@
     /** Port. */
     private final String port;
 
+    /** */
     private final String forceClientServerConnections;
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java
index db66493..b506f9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationMetricsListener.java
@@ -113,7 +113,10 @@
     /** Message type map. */
     private volatile Map<Short, String> msgTypeMap;
 
-    /** */
+    /**
+     * @param ignite Ignite instance.
+     * @param spiCtx Ignite SPI context.
+     */
     public TcpCommunicationMetricsListener(Ignite ignite, IgniteSpiContext spiCtx) {
         this.ignite = ignite;
         this.spiCtx = spiCtx;
@@ -185,7 +188,7 @@
         return msgCntrsByType;
     }
 
-    /** Metrics registry. */
+    /** @return Metrics registry. */
     public MetricRegistry metricRegistry() {
         return mreg;
     }
@@ -431,12 +434,22 @@
         }
     }
 
-    /** Generate metric name by message direct type id. */
+    /**
+     * Generate metric name by message direct type id.
+     *
+     * @param directType Direct type ID of sent message.
+     * @return Metric name for sent message.
+     */
     public static String sentMessagesByTypeMetricName(Short directType) {
         return metricName(SENT_MESSAGES_BY_TYPE_METRIC_NAME, directType.toString());
     }
 
-    /** Generate metric name by message direct type id. */
+    /**
+     * Generate metric name by message direct type id.
+     *
+     * @param directType Direct type ID of the received message.
+     * @return Metric name for the received message.
+     */
     public static String receivedMessagesByTypeMetricName(Short directType) {
         return metricName(RECEIVED_MESSAGES_BY_TYPE_METRIC_NAME, directType.toString());
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 4aaee1a..4442e03 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -1356,6 +1356,7 @@
      *
      * @param b0 The first byte.
      * @param b1 The second byte.
+     * @return Message type.
      */
     public static short makeMessageType(byte b0, byte b1) {
         return (short)((b1 & 0xFF) << 8 | b0 & 0xFF);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
index 53c80a9..3747184 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
@@ -1017,6 +1017,7 @@
         return recovery;
     }
 
+    /** */
     public void onChannelCreate(
         GridSelectorNioSessionImpl ses,
         ConnectionKey connKey,
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfiguration.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfiguration.java
index 57dae82..2b2d052 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpCommunicationConfiguration.java
@@ -53,6 +53,7 @@
     /** @see #IGNITE_SELECTOR_SPINS */
     public static final long DFLT_SELECTOR_SPINS = 0L;
 
+    /** */
     @SystemProperty(value = "Defines how many non-blocking selector.selectNow() should be made before falling into " +
         "selector.select(long) in NIO server. Can be set to Long.MAX_VALUE so " +
         "selector threads will never block", type = Long.class, defaults = "" + DFLT_SELECTOR_SPINS)
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java
index 2b6bbca..28fc5f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java
@@ -38,13 +38,13 @@
      * Facade interface representing {@link DiscoveryDataBag} object with discovery data from joining node.
      */
     public interface JoiningNodeDiscoveryData {
-        /** */
+        /** @return ID of the joining node. */
         UUID joiningNodeId();
 
-        /** */
+        /** @return Whether joining node provided discovery data. */
         boolean hasJoiningNodeData();
 
-        /** */
+        /** @return Joining node data. */
         Serializable joiningNodeData();
     }
 
@@ -52,13 +52,13 @@
      * Facade interface representing {@link DiscoveryDataBag} object with discovery data collected in the grid.
      */
     public interface GridDiscoveryData {
-        /** */
+        /** @return ID fo the joining node. */
         UUID joiningNodeId();
 
-        /** */
+        /** @return Common for all cluster nodes discovery data that is sent to the joining node. */
         Serializable commonData();
 
-        /** */
+        /** @return Discovery data that is mapped to the particular cluster node and sent to the joining node. */
         Map<UUID, Serializable> nodeSpecificData();
     }
 
@@ -293,23 +293,20 @@
         nodeSpecificData.putAll(nodeSpecData);
     }
 
-    /**
-     *
-     */
+    /** @return Discovery data for each Ignite component that is sent to the cluster nodes by joining node. */
     public Map<Integer, Serializable> joiningNodeData() {
         return joiningNodeData;
     }
 
     /**
-     *
+     * @return Discovery data for each Ignite component that is aggregated from the cluster nodes and sent to the
+     * joining node.
      */
     public Map<Integer, Serializable> commonData() {
         return commonData;
     }
 
-    /**
-     *
-     */
+    /** @return Discovery data that belongs to the current cluster node and is sent to the joining node. */
     @Nullable public Map<Integer, Serializable> localNodeSpecificData() {
         return nodeSpecificData.get(DEFAULT_KEY);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
index fc61880..f887e5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
@@ -29,6 +29,7 @@
      * nodes and on all existing nodes to transfer their data to new node.
      *
      * @param dataBag {@link DiscoveryDataBag} object managing discovery data during node joining process.
+     * @return Collected discovery data.
      */
     public DiscoveryDataBag collect(DiscoveryDataBag dataBag);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiHistorySupport.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiHistorySupport.java
index d17e96b..e3acc96 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiHistorySupport.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiHistorySupport.java
@@ -34,7 +34,7 @@
 @Target({ElementType.TYPE})
 public @interface DiscoverySpiHistorySupport {
     /**
-     * Whether or not target SPI supports topology snapshots history.
+     * @return Whether or not target SPI supports topology snapshots history.
      */
     public boolean value();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java
index 525e2e0..8f93549 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java
@@ -45,7 +45,7 @@
 @Target({ElementType.TYPE})
 public @interface DiscoverySpiOrderSupport {
     /**
-     * Whether or not target SPI supports node startup order.
+     * @return Whether or not target SPI supports node startup order.
      */
     public boolean value();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java
index 83e5a86..16ca16d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java
@@ -22,6 +22,6 @@
  * Marker interface for discovery thread on cluster server node.
  */
 public interface IgniteDiscoveryThread {
-    /** */
+    /** @return {@link GridWorker} instance associated with current thread. */
     GridWorker worker();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedNode.java
index 3bd9612..e7f30b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedNode.java
@@ -151,7 +151,7 @@
         this.cacheMetrics = cacheMetrics != null ? cacheMetrics : Collections.emptyMap();
     }
 
-    /** */
+    /** @param attrs Local node attributes. */
     public void setAttributes(Map<String, Object> attrs) {
         this.attrs = U.sealMap(attrs);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 4eea69d..61a0b25 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -511,6 +511,7 @@
 
     /**
      * @param id Id.
+     * @return Cluster node instance with specified ID.
      */
     public ClusterNode getNode0(UUID id) {
         if (impl instanceof ServerImpl)
@@ -995,7 +996,9 @@
      * <p>
      * If not specified, default is {@link #DFLT_SO_LINGER}
      * </p>
-    */
+     *
+     * @param soLinger SO_LINGER value.
+     */
     @IgniteSpiConfiguration(optional = true)
     public void setSoLinger(int soLinger) {
         this.soLinger = soLinger;
@@ -2432,6 +2435,7 @@
 
     /**
      * <strong>FOR TEST ONLY!!!</strong>
+     * @return Client workers count.
      */
     public int clientWorkerCount() {
         return ((ServerImpl)impl).clientWorkersCount();
@@ -2446,6 +2450,8 @@
 
     /**
      * <strong>FOR TEST ONLY!!!</strong>
+     *
+     * @param lsnr Listener of sent messages.
      */
     public void addSendMessageListener(IgniteInClosure<TcpDiscoveryAbstractMessage> lsnr) {
         sndMsgLsnrs.add(lsnr);
@@ -2458,6 +2464,8 @@
 
     /**
      * <strong>FOR TEST ONLY!!!</strong>
+     *
+     * @param lsnr Instance of the listener for sent messages.
      */
     public void removeSendMessageListener(IgniteInClosure<TcpDiscoveryAbstractMessage> lsnr) {
         sndMsgLsnrs.remove(lsnr);
@@ -2465,6 +2473,8 @@
 
     /**
      * <strong>FOR TEST ONLY!!!</strong>
+     *
+     * @param lsnr Instance of the listener for incoming messages.
      */
     public void addIncomeConnectionListener(IgniteInClosure<Socket> lsnr) {
         incomeConnLsnrs.add(lsnr);
@@ -2472,6 +2482,8 @@
 
     /**
      * <strong>FOR TEST ONLY!!!</strong>
+     *
+     * @param lsnr Instance of the listener for incoming messages.
      */
     public void removeIncomeConnectionListener(IgniteInClosure<Socket> lsnr) {
         incomeConnLsnrs.remove(lsnr);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
index 0731a1b..61f8e11 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
@@ -102,6 +102,7 @@
         this(new BasicJdbcIpFinderDialect());
     }
 
+    /** @param jdbcDialect SQL dialect to use with {@link TcpDiscoveryJdbcIpFinder}. */
     public TcpDiscoveryJdbcIpFinder(JdbcIpFinderDialect jdbcDialect) {
         setShared(true);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java
index 43b3adf..433566d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java
@@ -57,6 +57,8 @@
     /**
      * Restores spanContainer field to non-null value after deserialization.
      * This is needed for compatibility between nodes having Tracing SPI and not.
+     *
+     * @return Deserialized instance os the current class.
      */
     public Object readResolve() {
         if (spanContainer == null)
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
index 03915a3..57deda3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
@@ -37,6 +37,7 @@
     /**
      * @param creatorNodeId Creator node ID.
      * @param nodeToPing Pinged client node ID.
+     * @param res Result of the node ping.
      */
     public TcpDiscoveryClientPingResponse(UUID creatorNodeId, @Nullable UUID nodeToPing, boolean res) {
         super(creatorNodeId);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
index 3e42944..a7083ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
@@ -58,9 +58,7 @@
         return node;
     }
 
-    /**
-     *
-     */
+    /** @return Discovery data container that collects data from all cluster nodes. */
     public DiscoveryDataPacket gridDiscoveryData() {
         return dataPacket;
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
index 899b0af..e683532 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
@@ -176,6 +176,7 @@
     }
 
     /**
+     * @param nodeId Node ID.
      * @return {@code True} if this message contains metrics.
      */
     public boolean hasMetrics(UUID nodeId) {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/EncryptionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/EncryptionSpi.java
index 29d2128..31f1b84 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/EncryptionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/EncryptionSpi.java
@@ -77,6 +77,7 @@
      *
      * @param data Data to decrypt.
      * @param key Encryption key.
+     * @return Encrypted data.
      */
     byte[] decrypt(byte[] data, Serializable key);
 
@@ -85,6 +86,7 @@
      *
      * @param data Data to decrypt.
      * @param key Encryption key.
+     * @param res Destination of the decrypted data.
      */
     void decryptNoPadding(ByteBuffer data, Serializable key, ByteBuffer res);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionKey.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionKey.java
index c2577c7..d8b92b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionKey.java
@@ -53,7 +53,7 @@
     }
 
     /**
-     * Encryption key.
+     * @return Encryption key.
      */
     public Key key() {
         return k;
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
index 2ae15d2..a2221f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
@@ -51,6 +51,7 @@
      * by given predicate filter.
      *
      * @param p Event predicate filter.
+     * @param <T> Type of events.
      * @return Collection of events.
      */
     public <T extends Event> Collection<T> localEvents(IgnitePredicate<T> p);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/metric/ReadOnlyMetricRegistry.java b/modules/core/src/main/java/org/apache/ignite/spi/metric/ReadOnlyMetricRegistry.java
index 9965965..c628665 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/metric/ReadOnlyMetricRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/metric/ReadOnlyMetricRegistry.java
@@ -60,6 +60,7 @@
 
     /**
      * @param name Name of the metric.
+     * @param <M> Type of the metric.
      * @return Metric with specified name if exists. Null otherwise.
      */
     @Nullable public <M extends Metric> M findMetric(String name);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java
index 4664442..ef546b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java
@@ -31,6 +31,7 @@
     /**
      * @param pagesList Pages list.
      * @param bucket Bucket number.
+     * @param partId Partition ID.
      */
     public CachePagesListView(PagesList pagesList, int bucket, int partId) {
         super(pagesList, bucket);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java
index 2f6a3a9..1d8d89c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java
@@ -38,13 +38,13 @@
         this.value = value;
     }
 
-    /** */
+    /** @return Metastorage record name. */
     @Order
     public String name() {
         return name;
     }
 
-    /** */
+    /** @return Metastorage record value. */
     @Order(1)
     public String value() {
         return value;
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java
index 2a97ba8..709cccd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java
@@ -77,7 +77,7 @@
         return queue.bounded();
     }
 
-    /** Collocated flag. */
+    /** @return Collocated flag. */
     public boolean collocated() {
         return queue.collocated();
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopSpiSpecificSpan.java b/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopSpiSpecificSpan.java
index b897a79..e4eec51 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopSpiSpecificSpan.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopSpiSpecificSpan.java
@@ -27,7 +27,7 @@
     /**
      * Constructor.
      */
-    private NoopSpiSpecificSpan(){
+    private NoopSpiSpecificSpan() {
 
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/tracing/SpiSpecificSpan.java b/modules/core/src/main/java/org/apache/ignite/spi/tracing/SpiSpecificSpan.java
index 2afdc30..975a9e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/tracing/SpiSpecificSpan.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/tracing/SpiSpecificSpan.java
@@ -27,6 +27,7 @@
      *
      * @param tagName Tag name.
      * @param tagVal Tag value.
+     * @return {@code this} for chaining.
      */
     SpiSpecificSpan addTag(String tagName, String tagVal);
 
@@ -34,6 +35,7 @@
      * Logs work to span.
      *
      * @param logDesc Log description.
+     * @return {@code this} for chaining.
      */
     SpiSpecificSpan addLog(String logDesc);
 
@@ -41,11 +43,14 @@
      * Explicitly set status for span.
      *
      * @param spanStatus Status.
+     * @return {@code this} for chaining.
      */
     SpiSpecificSpan setStatus(SpanStatus spanStatus);
 
     /**
      * Ends span. This action sets default status if not set and mark the span as ready to be exported.
+     *
+     * @return {@code this} for chaining.
      */
     SpiSpecificSpan end();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/tracing/TracingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/tracing/TracingSpi.java
index adcb5e6..8c589e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/tracing/TracingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/tracing/TracingSpi.java
@@ -40,6 +40,7 @@
      *
      * @param name Name of span to create.
      * @param parentSpan Parent span.
+     * @return Span instance.
      */
     @NotNull S create(
         @NotNull String name,
@@ -49,6 +50,7 @@
      * Serializes span to byte array to send context over network.
      *
      * @param span Span.
+     * @return Span instance.
      */
     byte[] serialize(@NotNull S span);
 
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java
index 35f2e42..43768f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamTransformer.java
@@ -56,6 +56,8 @@
      * Creates a new transformer based on instance of {@link CacheEntryProcessor}.
      *
      * @param ep Entry processor.
+     * @param <K> Cache key type.
+     * @param <V> Cache value type.
      * @return Stream transformer.
      */
     public static <K, V> StreamTransformer<K, V> from(final CacheEntryProcessor<K, V, Object> ep) {
diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java
index f56929c..49624bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java
+++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java
@@ -42,6 +42,8 @@
      * Creates a new visitor based on instance of {@link IgniteBiInClosure}.
      *
      * @param c Closure.
+     * @param <K> Ignite cache key type.
+     * @param <V> Ignite cache value type.
      * @return Stream visitor.
      */
     public static <K, V> StreamVisitor<K, V> from(final IgniteBiInClosure<IgniteCache<K, V>, Map.Entry<K, V>> c) {
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java
index 6c1c62f..8a40dc2 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java
@@ -49,6 +49,7 @@
      * terminate if no tasks arrive within the keep-alive time.
      * @param keepAliveTime When the number of threads is greater than the core, this is the maximum time
      * that excess idle threads will wait for new tasks before terminating.
+     * @param eHnd Uncaught exception handler.
      */
     public IgniteStripedThreadPoolExecutor(
         int concurrentLvl,
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
index 515feec..6c65e69 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
@@ -96,6 +96,7 @@
      * @param igniteInstanceName Name of the Ignite instance this thread is created for.
      * @param threadName Name of thread.
      * @param r Runnable to execute.
+     * @param plc {@link GridIoPolicy} policy.
      * @param grpIdx Thread index within a group.
      * @param stripe Non-negative stripe number if this thread is striped pool thread.
      */
@@ -188,6 +189,8 @@
 
     /**
      * Callback before entry processor execution is started.
+     *
+     * @param holdsTopLock Whether to hold topology lock.
      */
     public static void onEntryProcessorEntered(boolean holdsTopLock) {
         Thread curThread = Thread.currentThread();
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionMetrics.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionMetrics.java
index f07c147..e0b7b9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionMetrics.java
@@ -62,6 +62,7 @@
      * Gets a map of all transactions for which the local node is the originating node and which duration
      * exceeds the given duration.
      *
+     * @param duration Transaction duration.
      * @return Map of local node owning transactions which duration is longer than {@code duration}.
      */
     public Map<String, String> getLongRunningOwnerTransactions(int duration);
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java b/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
index 92a0ebe..0f86de5 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
@@ -29,6 +29,7 @@
     @LoggerResource
     private IgniteLogger log;
 
+    /** */
     CountDownLatch latch;
 
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java b/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
index dcfac9c..593a84d 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
@@ -40,11 +40,13 @@
      */
     CountDownLatch latch;
 
+    /** */
     public GridTestTask(CountDownLatch latch) {
         super();
         this.latch = latch;
     }
 
+    /** */
     public GridTestTask() {
         super();
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
index 2301a62..53f2a40 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
@@ -241,7 +241,7 @@
         return startGrid(gridIdx);
     }
 
-    /* Different affinityBackupFilters have different goals */
+    /** Different affinityBackupFilters have different goals */
     protected int expectedNodesForEachPartition() {
        return backups + 1;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
index e9d9584..0b62c33 100755
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
@@ -36,6 +36,7 @@
     /** */
     private static final String CACHE1 = "cache1";
 
+    /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
@@ -50,11 +51,13 @@
         return cfg;
     }
 
+    /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         super.beforeTestsStarted();
         startGrids(NODE_CNT);
     }
 
+    /** */
     @Test
     public void testWronglySetAffinityFunctionForLocalCache() {
         Ignite node = ignite(NODE_CNT - 1);
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
index 4fee3db..556fb40 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java
@@ -376,6 +376,7 @@
             this.name = name;
         }
 
+        /** {@inheritDoc} */
         @Override public CacheStoreSessionListener create() {
             return new SessionListener(name);
         }
@@ -384,6 +385,7 @@
     /**
      */
     public static class Store extends CacheStoreAdapter<Integer, Integer> {
+        /** */
         public Store() {
         }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
index 0fde82b..96e1bd0 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
@@ -219,6 +219,7 @@
      * Test store factory.
      */
     private static class TestStoreFactory implements Factory<CacheStore> {
+        /** {@inheritDoc} */
         @Override public CacheStore create() {
             try {
                 CacheStore<Integer, String> store = new CacheJdbcBlobStore<>();
diff --git a/modules/core/src/test/java/org/apache/ignite/client/Config.java b/modules/core/src/test/java/org/apache/ignite/client/Config.java
index c279e8f..06c6772 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/Config.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/Config.java
@@ -32,6 +32,7 @@
     /** Name of the cache created by default in the cluster. */
     public static final String DEFAULT_CACHE_NAME = "default";
 
+    /** */
     private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder().setShared(true);
 
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java b/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java
index dc62e28..96ac7b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java
@@ -387,6 +387,7 @@
      * Enumeration for tests.
      */
     private enum Enum {
-        /** Default. */DEFAULT
+        /** Default. */
+        DEFAULT
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
index 3208d2e..bd3ff5e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
@@ -238,6 +238,7 @@
             return value(ctx, cpy, null);
         }
 
+        /** {@inheritDoc} */
         @Override public <T> @Nullable T value(CacheObjectValueContext ctx, boolean cpy, ClassLoader ldr) {
             A.notNull(ctx, "ctx");
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerWarningsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerWarningsTest.java
index 7c5b4b8..311b533 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerWarningsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerWarningsTest.java
@@ -207,6 +207,7 @@
             testLog.warningsTotal() < transactions);
     }
 
+    /** */
     @Test
     public void testDumpLongRunningOperationsWaitForFullyInitializedExchangeManager() throws Exception {
         long waitingTimeout = 5_000;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
index 339e43b..efe8baf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousTaskSelfTest.java
@@ -287,6 +287,7 @@
         @LoggerResource
         private IgniteLogger log;
 
+        /** {@inheritDoc} */
         @Override public Boolean apply(Object param) {
             counter++;
 
@@ -324,6 +325,7 @@
         @JobContextResource
         private ComputeJobContext jobCtx;
 
+        /** {@inheritDoc} */
         @Override public Object apply(Integer holdccTimeout) {
             assert holdccTimeout >= 2000;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java
index b9470c6..eb8e382 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobContextSelfTest.java
@@ -66,6 +66,7 @@
     /** */
     @SuppressWarnings("PublicInnerClass")
     public static class JobContextTask extends ComputeTaskSplitAdapter<Object, Object> {
+        /** {@inheritDoc} */
         @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) {
             Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
index 0018f7f..cccd276 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
@@ -327,6 +327,7 @@
         /** */
         private LifecycleEventType errType;
 
+        /** */
         private boolean gridErr;
 
         /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
index 448cb7c..5dbf9bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java
@@ -801,6 +801,7 @@
         testReentrantLockReconnect(true);
     }
 
+    /** */
     private void testReentrantLockReconnect(final boolean fair) throws Exception {
         Ignite client = grid(serverCount());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
index 5a2d3e1..0b88b55 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
@@ -29,6 +29,7 @@
  * Test of absence of gaps between jobs in compute
  */
 public class IgniteComputeJobOneThreadTest extends GridCommonAbstractTest {
+    /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String name) throws Exception {
         FifoQueueCollisionSpi colSpi = new FifoQueueCollisionSpi();
         colSpi.setParallelJobsNumber(1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
index 0444fab..ca9690b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
@@ -66,6 +66,7 @@
         }
     }
 
+    /** */
     @Test
     public void test() throws Exception {
         IgniteEx svr = startGrid(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java
index 4156423..a1d442b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java
@@ -214,8 +214,8 @@
         /** Id. */
         long id;
 
-        String name;
         /** Name. */
+        String name;
 
         /**
          * Constructor.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
index b4b7207..e087f4c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
@@ -716,7 +716,10 @@
      * Enumeration for tests.
      */
     public enum EnumType {
+        /** */
         ONE,
+
+        /** */
         TWO
     }
 
@@ -724,17 +727,23 @@
      * Enumeration for tests.
      */
     public enum DeclaredBodyEnum {
+        /** */
         ONE {
+            /** {@inheritDoc} */
             @Override boolean isSupported() {
                 return false;
             }
         },
+
+        /** */
         TWO {
+            /** {@inheritDoc} */
             @Override boolean isSupported() {
                 return false;
             }
         };
 
+        /** */
         abstract boolean isSupported();
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index 17360a8..0496816 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -598,60 +598,85 @@
         /** Primitive fields. */
         public byte fByte;
 
+        /** */
         public boolean fBool;
 
+        /** */
         public short fShort;
 
+        /** */
         public char fChar;
 
+        /** */
         public int fInt;
 
+        /** */
         public long fLong;
 
+        /** */
         public float fFloat;
 
+        /** */
         public double fDouble;
 
+        /** */
         public byte[] fByteArr;
 
+        /** */
         public boolean[] fBoolArr;
 
+        /** */
         public short[] fShortArr;
 
+        /** */
         public char[] fCharArr;
 
+        /** */
         public int[] fIntArr;
 
+        /** */
         public long[] fLongArr;
 
+        /** */
         public float[] fFloatArr;
 
+        /** */
         public double[] fDoubleArr;
 
         /** Special fields. */
         public String fString;
 
+        /** */
         public Date fDate;
 
+        /** */
         public Timestamp fTimestamp;
 
+        /** */
         public UUID fUuid;
 
+        /** */
         public BigDecimal fDecimal;
 
+        /** */
         public String[] fStringArr;
 
+        /** */
         public Date[] fDateArr;
 
+        /** */
         public Timestamp[] fTimestampArr;
 
+        /** */
         public UUID[] fUuidArr;
 
+        /** */
         public BigDecimal[] fDecimalArr;
 
         /** Nested object. */
         public TestInnerObject fObj;
 
+        /** */
         public TestInnerObject[] fObjArr;
 
         /** Field which is always set to null. */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 60f287a..4ac7bb8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -4347,7 +4347,20 @@
     /**
      */
     private enum TestEnum {
-        A, B, C, D, E
+        /** */
+        A,
+
+        /** */
+        B,
+
+        /** */
+        C,
+
+        /** */
+        D,
+
+        /** */
+        E
     }
 
     /** */
@@ -5050,15 +5063,20 @@
      * Holder for non-stadard collections.
      */
     private static class CustomCollections {
+        /** */
         public List list = new ArrayList();
 
+        /** */
         public List customList = new CustomArrayList();
     }
 
+    /** */
     @SuppressWarnings("unchecked")
     private static class CustomCollectionsWithFactory implements Binarylizable {
+        /** */
         public List list = new CustomArrayList();
 
+        /** */
         public Map map = new CustomHashMap();
 
         /** {@inheritDoc} */
@@ -5406,6 +5424,7 @@
      *
      */
     private static class MySingleton {
+        /** */
         public static final MySingleton INSTANCE = new MySingleton();
 
         /** */
@@ -5786,17 +5805,23 @@
 
     /** */
     public enum DeclaredBodyEnum {
+        /** */
         ONE {
+            /** {@inheritDoc} */
             @Override boolean isSupported() {
                 return false;
             }
         },
+
+        /** */
         TWO {
+            /** {@inkheritDoc} */
             @Override boolean isSupported() {
                 return false;
             }
         };
 
+        /** */
         abstract boolean isSupported();
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
index 3ea1a2d..e7eb744 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
@@ -141,7 +141,20 @@
     /**
      */
     private enum TestEnum {
-        A, B, C, D, E
+        /** */
+        A,
+
+        /** */
+        B,
+
+        /** */
+        C,
+
+        /** */
+        D,
+
+        /** */
+        E
     }
 
     /**
@@ -165,6 +178,7 @@
         /** */
         private TestEnum[] enumArr;
 
+        /** */
         private SimpleObject otherObj;
 
         /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
index c34004a..067866c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
@@ -323,7 +323,14 @@
      *
      */
     public enum TestObjectEnum {
-        A, B, C
+        /** */
+        A,
+
+        /** */
+        B,
+
+        /** */
+        C
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java
index 973ef2f..9c8935b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java
@@ -406,6 +406,7 @@
         Assert.assertArrayEquals(arr, in.readDoubleArray(ARR_LEN), 0);
     }
 
+    /** */
     @Test(expected = IllegalArgumentException.class)
     public void testEnsureCapacityNegative() {
         out.ensureCapacity(Integer.MIN_VALUE);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
index 0016124..5d8c34c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
@@ -62,7 +62,7 @@
     /** Partitioned with custom affinity cache name. */
     protected static final String PART_CUSTOM_AFFINITY_CACHE_NAME = "partitioned_custom_affinity_cache";
 
-    /* Name of a partitioned cache with 0 backups. */
+    /** Name of a partitioned cache with 0 backups. */
     protected static final String PART_CACHE_0_BACKUPS_NAME = "partitioned_0_backup_cache";
 
     /** Name of a partitioned cache with 1 backups. */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index 6917dbe..e68bc00 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -180,6 +180,7 @@
         }
     }
 
+    /** */
     @Test
     public void testUseStringSerVer2() throws Exception {
         String old = System.getProperty(IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
index ca2dd80..0940e73 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
@@ -237,6 +237,7 @@
         doForceServerAndClientTest();
     }
 
+    /** */
     @Test
     public void checkMessageOnCoordinatorChangeTest() throws Exception {
         startGrid(1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
index 642421b..7129eb7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
@@ -32,9 +32,10 @@
  *
  */
 public class OptimizedMarshallerEnumSelfTest {
-
+    /** */
     private String igniteHome = System.getProperty("user.dir");
 
+    /** */
     private final IgniteLogger rootLog = new GridTestLog4jLogger(false);
 
     /**
@@ -58,6 +59,7 @@
         assertEquals(TestEnum.Bond.desc, unmarshalled.desc);
     }
 
+    /** */
     private GridKernalContext newContext() throws IgniteCheckedException {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
@@ -67,25 +69,33 @@
         return new GridTestKernalContext(rootLog.getLogger(OptimizedMarshallerEnumSelfTest.class), cfg);
     }
 
+    /** */
     private enum TestEnum {
+        /** */
         Equity("Equity") {
+            /** {@inheritDoc} */
             @Override public String getTestString() {
                 return "eee";
             }
         },
 
+        /** */
         Bond("Bond") {
+            /** {@inheritDoc} */
             @Override public String getTestString() {
                 return "qqq";
             }
         };
 
+        /** */
         public final String desc;
 
+        /** */
         TestEnum(String desc) {
             this.desc = desc;
         }
 
+        /** */
         public abstract String getTestString();
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
index 90a8cae..e6e3e1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
@@ -85,6 +85,7 @@
     private static class TestClass2 implements Serializable {
         private static final long serialVersionUID = 0L;
 
+        /** */
         private Integer field3 = 1;
 
         /** For serialization compatibility. */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java
index 32b2a62..f2475ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java
@@ -508,14 +508,17 @@
             }
         }
 
+        /** {@inheritDoc} */
         @Override public void setExternalCollisionListener(@Nullable CollisionExternalListener lsnr) {
             // No-op.
         }
 
+        /** {@inheritDoc} */
         @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
             // No-op.
         }
 
+        /** {@inheritDoc} */
         @Override public void spiStop() throws IgniteSpiException {
             // No-op.
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
index cfd8a56..498385c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
@@ -53,18 +53,25 @@
     /** */
     protected IgniteProductVersion ver = new IgniteProductVersion();
 
+    /** */
     private ClusterNode clusterNode1 = node(metrics, ver, "1");
 
+    /** */
     private ClusterNode clusterNode2 = node(metrics, ver, "2");
 
+    /** */
     private ClusterNode clusterNode3 = node(metrics, ver, "3");
 
+    /** */
     private ClusterNode clusterNode4 = node(metrics, ver, "4");
 
+    /** */
     private ClusterNode clusterNode5 = node(metrics, ver, "5");
 
+    /** */
     private ClusterNode clusterNode6 = node(metrics, ver, "6");
 
+    /** */
     private List<ClusterNode> clusterNodes = new ArrayList<ClusterNode>() {{
         add(clusterNode1);
         add(clusterNode2);
@@ -163,6 +170,7 @@
             assertTrue(unwrapped instanceof BitSetIntSet);
     }
 
+    /** */
     private void assertPartitions(AffinityAssignment gridAffinityAssignment) {
         List<Integer> parts = new ArrayList<Integer>() {{
             add(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
index b658e92..5eec803 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
@@ -236,9 +236,14 @@
      *
      */
     private enum CustomEnum {
-        /** */ONE(1),
-        /** */TWO(2),
-        /** */THREE(3);
+        /** */
+        ONE(1),
+
+        /** */
+        TWO(2),
+
+        /** */
+        THREE(3);
 
         /** Value. */
         private final Object val;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityKeyConfigurationMismatchTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityKeyConfigurationMismatchTest.java
index 2df1b2a..ad3e45b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityKeyConfigurationMismatchTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityKeyConfigurationMismatchTest.java
@@ -259,10 +259,12 @@
         @AffinityKeyMapped
         int a;
 
+        /** */
         public AKey(int a) {
             this.a = a;
         }
 
+        /** */
         @Override public String toString() {
             return "AKey{a=" + a + '}';
         }
@@ -276,10 +278,12 @@
         @AffinityKeyMapped
         int b;
 
+        /** */
         public BKey(int b) {
             this.b = b;
         }
 
+        /** {@inheritDoc} */
         @Override public String toString() {
             return "BKey{b=" + b + '}';
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java
index 546a23f..c346efc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java
@@ -70,6 +70,7 @@
         startGrids(GRID_CNT);
     }
 
+    /** */
     @Test
     public void testCacheSize() throws Exception {
         startClientGrid(GRID_CNT);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 71b40cd..cafe88b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -867,6 +867,7 @@
         @IgniteInstanceResource
         private Ignite node;
 
+        /** {@inheritDoc} */
         @Override public CacheStore create() {
             String igniteInstanceName = node.configuration().getIgniteInstanceName();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index 02e6db4..7aabb1b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -63,12 +63,14 @@
     /** */
     private static final int KEY_CNT = 500;
 
+    /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration configuration = super.getConfiguration(igniteInstanceName);
         configuration.setMetricsUpdateFrequency(2000);
         return configuration;
     }
 
+    /** {@inheritDoc} */
     @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
         CacheConfiguration configuration = super.cacheConfiguration(igniteInstanceName);
         configuration.setStatisticsEnabled(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
index 11a150b..b63fc95 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
@@ -93,6 +93,7 @@
             "org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
     }
 
+    /** */
     protected CacheAtomicityMode atomicityMode() {
         return ATOMIC;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
index d7270e8..8784dd9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
@@ -263,6 +263,7 @@
     /**
      */
     private static class TestTopologyValidator extends TestLifecycleAware implements TopologyValidator {
+        /** */
         @IgniteInstanceResource
         private Ignite ignite;
 
@@ -277,6 +278,7 @@
             return false;
         }
 
+        /** {@inheritDoc} */
         @Override public void start() {
             super.start();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java
index cacf22a..33821d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallerTxAbstractTest.java
@@ -37,10 +37,12 @@
      * Wrong Externalizable class.
      */
     private static class GridCacheWrongValue implements Externalizable {
+        /** */
         @Override public void writeExternal(ObjectOutput out) throws IOException {
             throw new NullPointerException("Expected exception.");
         }
 
+        /** */
         @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
             throw new NullPointerException("Expected exception.");
         }
@@ -50,8 +52,10 @@
      * Wrong Externalizable class.
      */
     private static class GridCacheWrongValue1 {
+        /** */
         private int val1 = 8;
 
+        /** */
         private long val2 = 9;
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index 5e90633..5edfcf7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@ -86,6 +86,7 @@
         prepare();
     }
 
+    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         received.set(false);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 5d77172..cb3e45d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -57,6 +57,7 @@
     /** */
     private static final String VALUE = createValue();
 
+    /** */
     public static final CachePeekMode[] ALL_PEEK_MODES = new CachePeekMode[] {CachePeekMode.ALL};
 
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java
index 618373b..b4b1df5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteAbstractDynamicCacheStartFailTest.java
@@ -553,6 +553,7 @@
         checkCacheOperations(clientNode.cache(EXISTING_CACHE_NAME));
     }
 
+    /** */
     @Test
     public void testConcurrentClientNodeJoins() throws Exception {
         final int clientCnt = 3;
@@ -609,6 +610,7 @@
         checkCacheOperations(cache);
     }
 
+    /** */
     protected void testDynamicCacheStart(final Collection<CacheConfiguration> cfgs, final int initiatorId) {
         assert initiatorId < gridCount();
 
@@ -813,13 +815,16 @@
      *
      */
     public static class Value {
+        /** */
         @QuerySqlField
         private final int fieldVal;
 
+        /** */
         public Value(int fieldVal) {
             this.fieldVal = fieldVal;
         }
 
+        /** */
         public int getValue() {
             return fieldVal;
         }
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 81f0319..8433f54 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
@@ -6605,16 +6605,19 @@
      *
      */
     private static class CheckEntriesDeletedTask extends TestIgniteIdxRunnable {
+        /** */
         private final int cnt;
 
         /** */
         private String cacheName;
 
+        /** */
         public CheckEntriesDeletedTask(int cnt, String cacheName) {
             this.cnt = cnt;
             this.cacheName = cacheName;
         }
 
+        /** {@inheritDoc} */
         @Override public void run(int idx) throws Exception {
             for (int i = 0; i < cnt; i++) {
                 String key = String.valueOf(i);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java
index 95dd27c..becc5e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java
@@ -113,6 +113,7 @@
      *
      */
     private static class Value implements Serializable {
+        /** */
         private int val;
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java
index a1f9f70..ad2dc70 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheScanPredicateDeploymentSelfTest.java
@@ -69,6 +69,7 @@
         return cfg;
     }
 
+    /** */
     protected CacheAtomicityMode atomicityMode() {
         return TRANSACTIONAL;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java
index a0f2f5c..8898140 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartCoordinatorFailoverTest.java
@@ -45,6 +45,7 @@
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
+/** */
 public class IgniteDynamicCacheStartCoordinatorFailoverTest extends GridCommonAbstractTest {
     /** Latch which blocks DynamicCacheChangeFailureMessage until main thread has sent node fail signal. */
     private static volatile CountDownLatch latch;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java
index 690d092..362e1e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java
@@ -58,9 +58,12 @@
         return cfg;
     }
 
+    /** */
     private static class StoreFactory implements Factory<CacheStore<Object, Object>> {
+        /** */
         private boolean nullVal;
 
+        /** */
         public StoreFactory(boolean nullVal) {
             this.nullVal = nullVal;
         }
@@ -78,8 +81,10 @@
      *
      */
     private static class Store extends CacheStoreAdapter<Object, Object> implements Serializable {
+        /** */
         private boolean nullVal;
 
+        /** */
         public Store(boolean nullVal) {
             this.nullVal = nullVal;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheSeparateDirectoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheSeparateDirectoryTest.java
index fee64c9..34ffeb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheSeparateDirectoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheSeparateDirectoryTest.java
@@ -201,13 +201,19 @@
 
     /** */
     private enum AccessMode {
+        /** */
         SERVER,
+
+        /** */
         CLIENT,
+
+        /** */
         CLOSURE;
     }
 
     /** */
     static class TestClass {
+        /** */
         @QuerySqlField
         private int f = 42;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
index a709af6..08c8f16 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
@@ -44,6 +44,7 @@
             startClientGrid("client-" + i);
     }
 
+    /** */
     @Test
     public void testGetOffHeapPrimaryEntriesCount() throws Exception {
         String cacheName = "testGetOffHeapPrimaryEntriesCount";
@@ -73,6 +74,7 @@
         assertGetOffHeapPrimaryEntriesCount(cacheName, 1000);
     }
 
+    /** */
     private void assertGetOffHeapPrimaryEntriesCount(String cacheName, int count) throws Exception {
         long localPrimary = 0L;
         long localBackups = 0L;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectUserClassloaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectUserClassloaderSelfTest.java
index 070999e..bc6173e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectUserClassloaderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectUserClassloaderSelfTest.java
@@ -258,6 +258,7 @@
      *
      */
     private static class WrappingClassLoader extends ClassLoader {
+        /** */
         public WrappingClassLoader(ClassLoader parent) {
             super(parent);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index 484658c..c295d71 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -1352,6 +1352,7 @@
      * No-op entry processor.
      */
     private static class ObjectEntryProcessor implements EntryProcessor<Integer, TestObject, Boolean> {
+        /** {@inheritDoc} */
         @Override public Boolean process(MutableEntry<Integer, TestObject> entry, Object... args) throws EntryProcessorException {
             TestObject obj = entry.getValue();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
index a9fc43c..5ffec1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
@@ -305,6 +305,7 @@
             this.val = val;
         }
 
+        /** */
         public Integer val() {
             return val;
         }
@@ -349,6 +350,7 @@
             this.val = val;
         }
 
+        /** */
         public Integer val() {
             return val;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionsClusterReadOnlyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionsClusterReadOnlyAbstractTest.java
index 7357557..7f6be926 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionsClusterReadOnlyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionsClusterReadOnlyAbstractTest.java
@@ -189,6 +189,7 @@
         }
     }
 
+    /** */
     private void commonChecks() {
         igniteCollections.forEach(c -> assertEquals(name(c), COLLECTION_SIZE, c.size()));
         igniteCollections.forEach(c -> assertTrue(name(c), c.containsAll(Arrays.asList(ELEM, name(c)))));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteQueueClusterReadOnlyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteQueueClusterReadOnlyTest.java
index b6bb791..83b9ba4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteQueueClusterReadOnlyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteQueueClusterReadOnlyTest.java
@@ -63,6 +63,7 @@
         performAction(c -> cast(c).close());
     }
 
+    /** {@inheritDoc} */
     @Override public void testRemoveDenied() {
         super.testRemoveDenied();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
index fd7a439..01f732a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
@@ -379,6 +379,7 @@
      * @param <E> Closure argument type.
      */
     private abstract static class GridInUnsafeClosure<E> {
+        /** */
         public abstract void apply(E p) throws IgniteCheckedException;
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index 437d0b3..a914537 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -33,6 +33,7 @@
         return TRANSACTIONAL;
     }
 
+    /** */
     @Ignore("https://issues.apache.org/jira/browse/IGNITE-1593")
     @Test
     @Override public void testNodeRestart(){
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
index d12f5b6..0f814c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
@@ -230,6 +230,7 @@
         return grid.getOrCreateCache(cacheConfiguration(cacheName));
     }
 
+    /** */
     private CacheConfiguration cacheConfiguration(String cacheName) {
         CacheConfiguration ccfg = defaultCacheConfiguration();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
index 3bb6702..185132d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
@@ -53,6 +53,7 @@
         return CacheAtomicityMode.ATOMIC;
     }
 
+    /** {@inheritDoc} */
     @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
         CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
index d5f83db..69a2a88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
@@ -368,6 +368,7 @@
      *
      */
     private static class FirstStoreFactory implements Factory<CacheStore> {
+        /** */
         @IgniteInstanceResource
         private Ignite ignite;
 
@@ -383,6 +384,7 @@
      *
      */
     private static class SecondStoreFactory implements Factory<CacheStore> {
+        /** */
         @IgniteInstanceResource
         private Ignite ignite;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java
index f36ee2a..b6b8917 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java
@@ -165,6 +165,7 @@
      *
      */
     static class TestDiscoverySpi extends TcpDiscoverySpi {
+        /** {@inheritDoc} */
         @Override public void spiStop() throws IgniteSpiException {
             // Called communication SPI onContextDestroyed, but do not allow discovery to stop.
             if (ignite.configuration().isClientMode()) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java
index c7c0ea4..b4ca9da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java
@@ -52,6 +52,7 @@
     /** Listening test logger. */
     ListeningTestLogger listeningLog;
 
+    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java
index 07a858e..06f2f84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
+/** */
 public class GridCacheDhtPreloadOnheapSelfTest extends GridCacheDhtPreloadSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
index 14facae..e283d85 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 
+/** */
 public class GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest extends GridCachePartitionedNearDisabledOnheapFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheAtomicityMode atomicityMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
index 7167089..289c847 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 
+/** */
 public class GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest
     extends GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java
index 620db8a..1f8b50d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
+/** */
 public class GridCachePartitionedNearDisabledOnheapFullApiSelfTest
     extends GridCachePartitionedNearDisabledFullApiSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java
index 3769103..40bc89a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
+/** */
 public class GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest
     extends GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index a767aa3..e0d499e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -601,6 +601,7 @@
         }
     }
 
+    /** */
     private static class TestStoreFactory implements Factory<CacheStore> {
         /** {@inheritDoc} */
         @Override public CacheStore create() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java
index 977fea4..45b52a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicFullApiSelfTest;
 
+/** */
 public class GridCacheAtomicOnheapFullApiSelfTest extends GridCacheAtomicFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
index ddd8916..a060cef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
+/** */
 public class GridCacheAtomicOnheapMultiNodeFullApiSelfTest extends GridCacheAtomicOnheapFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected int gridCount() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index 7123668..c1c6a53 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -79,6 +79,7 @@
         startGridsMultiThreaded(GRID_CNT);
     }
 
+    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
index c05e6ed..423c0c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 
+/** */
 public class GridCachePartitionedAtomicOnheapFullApiSelfTest extends GridCachePartitionedOnheapFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheAtomicityMode atomicityMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
index 573c5a4..8eaf134 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 
+/** */
 public class GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest extends GridCachePartitionedOnheapMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheAtomicityMode atomicityMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java
index c9f29fe..292031c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
+/** */
 public class GridCachePartitionedOnheapFullApiSelfTest extends GridCachePartitionedFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java
index 14cc6cb..0ee1234 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
+/** */
 public class GridCachePartitionedOnheapMultiNodeFullApiSelfTest extends GridCachePartitionedMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
index d5d395b..5caf1b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePutArrayValueSelfTest.java
@@ -41,6 +41,7 @@
         return 4;
     }
 
+    /** {@inheritDoc} */
     @Override protected void initStoreStrategy() throws IgniteCheckedException {
         if (!MvccFeatureChecker.isSupported(MvccFeatureChecker.Feature.CACHE_STORE))
             return;
@@ -84,6 +85,7 @@
     /** Test key without {@link GridCacheInternal} parent interface. */
     @SuppressWarnings("PublicInnerClass")
     public static class InternalKey implements Externalizable, GridCacheInternal {
+        /** */
         private long key;
 
         /**
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 5659290..bb4eba9 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
@@ -864,7 +864,9 @@
         }
     }
 
+    /** */
     private static class EventListener implements IgnitePredicate<Event> {
+        /** {@inheritDoc} */
         @Override public boolean apply(Event evt) {
             System.out.println("Cache event: " + evt);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java
index 1f19e10..ae3f15f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java
@@ -82,6 +82,7 @@
     /** Policy max memory size. */
     protected long plcMaxMemSize = 0;
 
+    /** */
     protected Factory<T> policyFactory;
 
     /** Near policy max. */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java
index e096361..ce35b4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java
@@ -50,9 +50,12 @@
         }
     }
 
+    /** */
     private static class TestEvictionPolicy implements EvictionPolicy<TestKey, String>, Serializable {
+        /** */
         private final Collection<EvictableEntry> entries = new ArrayList<>();
 
+        /** {@inheritDoc} */
         @Override public synchronized void onEntryAccessed(boolean rmv, EvictableEntry<TestKey, String> e) {
             for (EvictableEntry e0 : entries)
                 assertTrue(e0.equals(e));
@@ -61,13 +64,17 @@
         }
     }
 
+    /** */
     private static class TestKey {
+        /** */
         private final int key;
 
+        /** */
         public TestKey(int key) {
             this.key = key;
         }
 
+        /** {@inheritDoc} */
         @Override public boolean equals(Object other) {
             if (this == other)
                 return true;
@@ -81,6 +88,7 @@
 
         }
 
+        /** {@inheritDoc} */
         @Override public int hashCode() {
             return key;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
index 086e8ef..a147898 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
@@ -317,6 +317,7 @@
      *
      */
     private static class NoReadThroughStoreFactory implements Factory<CacheStore> {
+        /** {@inheritDoc} */
         @Override public CacheStore create() {
             return new TestStore() {
                 @Override public void loadCache(IgniteBiInClosure<Object, Object> clo, Object... args) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
index 2a5c2da..28debc8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOnheapMultiNodeFullApiSelfTest;
 
+/** */
 public class GridCacheAtomicOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicOnheapMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean isMultiJvm() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java
index 7ac4e4d..e7a2583 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest;
 
+/** */
 public class GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest
     extends GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java
index fef23ad..70fd71e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest;
 
+/** */
 public class GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest
     extends GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java
index bdde212..0526c94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOnheapMultiNodeFullApiSelfTest;
 
+/** */
 public class GridCachePartitionedOnheapMultiJvmFullApiSelfTest extends GridCachePartitionedOnheapMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean isMultiJvm() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java
index c609ce7..6b95328 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java
@@ -20,6 +20,7 @@
 
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOnheapMultiNodeFullApiSelfTest;
 
+/** */
 public class GridCacheReplicatedOnheapMultiJvmFullApiSelfTest extends GridCacheReplicatedOnheapMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean isMultiJvm() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index c0286b4..33aa10b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -687,8 +687,11 @@
 
     /** */
     private enum EnumType {
-        /** */ ENUM_VAL_0,
-        /** */ ENUM_VAL_1
+        /** */
+        ENUM_VAL_0,
+
+        /** */
+        ENUM_VAL_1
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index 7a36be7..acf0197 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -753,10 +753,12 @@
         /** Flag indicates that value has removed. */
         private final boolean removed;
 
+        /** */
         private TestValue(long order, int v1, int v2) {
             this(order, v1, v2, false);
         }
 
+        /** */
         private TestValue(long order, int v1, int v2, boolean removed) {
             this.order = order;
             this.v1 = v1;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java
index 4a2f115..3c47254 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDefragmentationTest.java
@@ -250,6 +250,7 @@
         validateLeftovers(workDir);
     }
 
+    /** */
     protected long[] partitionSizes(CacheGroupContext grp) {
         final int grpId = grp.groupId();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
index 13bec22..81be10a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
@@ -236,6 +236,7 @@
      *
      */
     protected static class BlockTcpCommunicationSpi extends TcpCommunicationSpi {
+        /** */
         private volatile IgniteInClosure<GridDhtPartitionsSingleMessage> cls;
 
         /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenanceRegistrySimpleTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenanceRegistrySimpleTest.java
index 57ab147..58b0bb0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenanceRegistrySimpleTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenanceRegistrySimpleTest.java
@@ -302,6 +302,7 @@
         /** */
         private final List<MaintenanceAction<?>> actions = new ArrayList<>();
 
+        /** */
         SimpleMaintenanceCallback(List<MaintenanceAction<?>> actions) {
             this.actions.addAll(actions);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
index d723bb9..bb58a99 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
@@ -63,6 +63,7 @@
         return null;
     }
 
+    /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java
index 654dde9..3507f6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPartitionPreloadTest.java
@@ -710,8 +710,13 @@
 
     /** */
     private enum PreloadMode {
-        /** Sync. */ SYNC,
-        /** Async. */ASYNC,
-        /** Local. */LOCAL;
+        /** Sync. */
+        SYNC,
+
+        /** Async. */
+        ASYNC,
+
+        /** Local. */
+        LOCAL;
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest2.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest2.java
index 7a08ae0..f013f18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest2.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest2.java
@@ -35,6 +35,7 @@
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
+/** */
 public class IgnitePdsWithTtlTest2 extends GridCommonAbstractTest {
     /** */
     public static AtomicBoolean handleFired = new AtomicBoolean(false);
@@ -129,6 +130,7 @@
         assertFalse(handleFired.get());
     }
 
+    /** */
     private class CustomStopNodeOrHaltFailureHandler extends NoOpFailureHandler {
         /** {@inheritDoc} */
         @Override public boolean onFailure(Ignite ignite, FailureContext failureCtx) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java
index bc77efd..809a77d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/ProgressWatchdog.java
@@ -53,6 +53,7 @@
  * processed at client size. Long absence of this calls will cause thread dumps to be generated.
  */
 class ProgressWatchdog {
+    /** */
     public static final int CHECK_PERIOD_MSEC = 1000;
 
     /** Progress counter, Overall records processed. */
@@ -482,6 +483,7 @@
         stopPool(pool);
     }
 
+    /** */
     public static void stopPool(ExecutorService pool) {
         pool.shutdown();
         try {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
index 0caec57..58bdef6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
@@ -1114,6 +1114,7 @@
      */
     private static class PartitionMetaStateRecordExcludeIterator
         extends GridFilteredClosableIterator<IgniteBiTuple<WALPointer, WALRecord>> {
+        /** */
         private PartitionMetaStateRecordExcludeIterator(
             GridCloseableIterator<? extends IgniteBiTuple<WALPointer, WALRecord>> it) {
             super(it);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
index 99c1e68..ea9697f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
@@ -81,11 +81,13 @@
         return cfg;
     }
 
+    /** */
     @Before
     public void before() throws Exception {
         cleanPersistenceDir();
     }
 
+    /** */
     @After
     public void after() throws Exception {
         stopAllGrids();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java
index fe9f8f2..063d9fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java
@@ -275,17 +275,31 @@
      * Crash point.
      */
     private enum NodeStopPoint {
+        /** */
         BEFORE_WRITE_KEY_TO_META_STORE(false),
+
+        /** */
         AFTER_WRITE_KEY_TO_META_STORE(true),
+
+        /** */
         AFTER_CHECKPOINT_BEFORE_DISABLE_WAL(true),
+
+        /** */
         AFTER_DISABLE_WAL(true),
+
+        /** */
         AFTER_ENABLE_WAL(true),
+
+        /** */
         AFTER_CHECKPOINT_AFTER_ENABLE_WAL(true),
+
+        /** */
         AFTER_REMOVE_KEY_TO_META_STORE(false);
 
         /** Clean up flag. */
         private final boolean needCleanUp;
 
+        /** */
         NodeStopPoint(boolean up) {
             needCleanUp = up;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index afd756d..64a521d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -1732,7 +1732,14 @@
 
     /** Enum for cover binaryObject enum save/load. */
     enum TestEnum {
-        /** */A, /** */B, /** */C
+        /** */
+        A,
+
+        /** */
+        B,
+
+        /** */
+        C
     }
 
     /** Special class to test WAL reader resistance to Serializable interface. */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java
index 51b64a6..56d1ba0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerManagerTest.java
@@ -216,6 +216,7 @@
         }
     }
 
+    /** */
     private void printOverhead(PageLockTrackerManager mgr) {
         System.out.println(
             "Head:" + mgr.getHeapOverhead()
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java
index 32874c6..f5b408e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java
@@ -191,11 +191,13 @@
         stopGrid(0);
     }
 
+    /** */
     @After
     public void after() {
         stopAllGrids();
     }
 
+    /** */
     @Before
     public void before() throws Exception {
         cleanPersistenceDir();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java
index 93a7898..0417d33 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java
@@ -30,7 +30,7 @@
 
 /** */
 public class PageMemoryLazyAllocationWithPDSTest extends PageMemoryLazyAllocationTest {
-
+    /** */
     public static final long PETA_BYTE = 1024 * GB;
 
     /** {@inheritDoc} */
@@ -126,6 +126,7 @@
         awaitPartitionMapExchange();
     }
 
+    /** */
     @NotNull private IgniteConfiguration cfgWithHugeRegion(String name) throws Exception {
         IgniteConfiguration cfg = getConfiguration(name);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManagerSelfTest.java
index b7648f6..e31b175 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManagerSelfTest.java
@@ -643,6 +643,7 @@
 
     /** */
     private static class ZeroPartitionAffinityFunction extends RendezvousAffinityFunction {
+        /** {@inheritDoc} */
         @Override public int partition(Object key) {
             return 0;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java
index 15f8397..56685bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java
@@ -218,22 +218,27 @@
         joinClientStaticCacheConfigurationDifferentOnBothTemplate().execute();
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientWithOutConfigurationTemplate() throws Exception {
         return withOutConfigurationTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationOnJoinTemplate() throws Exception {
         return staticCacheConfigurationOnJoinTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationInClusterTemplate() throws Exception {
         return staticCacheConfigurationInClusterTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationDifferentOnBothTemplate() throws Exception {
         return staticCacheConfigurationDifferentOnBothTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationSameOnBothTemplate() throws Exception {
         return staticCacheConfigurationSameOnBothTemplate().nodeConfiguration(setClient);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java
index d24661f..804d761 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java
@@ -256,14 +256,17 @@
         joinClientStaticCacheConfigurationDifferentOnBothTemplate().execute();
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientWithOutConfigurationTemplate() throws Exception {
         return withOutConfigurationTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationOnJoinTemplate() throws Exception {
         return staticCacheConfigurationOnJoinTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationInClusterTemplate() throws Exception {
         return staticCacheConfigurationInClusterTemplate()
             .nodeConfiguration(setClient)
@@ -324,10 +327,12 @@
             });
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationSameOnBothTemplate() throws Exception {
         return staticCacheConfigurationSameOnBothTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationDifferentOnBothTemplate() throws Exception {
         return staticCacheConfigurationDifferentOnBothTemplate()
             .nodeConfiguration(setClient)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java
index 2a309b3..093c7e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java
@@ -218,22 +218,27 @@
         joinClientStaticCacheConfigurationDifferentOnBothTemplate().execute();
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientWithOutConfigurationTemplate() throws Exception {
         return withOutConfigurationTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationOnJoinTemplate() throws Exception {
         return staticCacheConfigurationOnJoinTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationInClusterTemplate() throws Exception {
         return staticCacheConfigurationInClusterTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationSameOnBothTemplate() throws Exception {
         return staticCacheConfigurationSameOnBothTemplate().nodeConfiguration(setClient);
     }
 
+    /** {@inheritDoc} */
     @Override public JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationDifferentOnBothTemplate() throws Exception {
         return staticCacheConfigurationDifferentOnBothTemplate().nodeConfiguration(setClient);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java
index f420827..118c512 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinInActiveNodeToActiveClusterWithPersistence.java
@@ -30,6 +30,7 @@
         return persistentCfg(super.cfg(name));
     }
 
+    /** */
     private AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder persistent(AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder b) {
         b.afterClusterStarted(
             b.checkCacheEmpty()
@@ -44,6 +45,7 @@
         return b;
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder withOutConfigurationTemplate() throws Exception {
         AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder b = persistent(super.withOutConfigurationTemplate());
 
@@ -52,6 +54,7 @@
         return b;
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder joinClientWithOutConfigurationTemplate() throws Exception {
         AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder b = persistent(super.joinClientWithOutConfigurationTemplate());
 
@@ -60,28 +63,34 @@
         return b;
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationInClusterTemplate()
         throws Exception {
         return persistent(super.joinClientStaticCacheConfigurationInClusterTemplate());
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder joinClientStaticCacheConfigurationDifferentOnBothTemplate()
         throws Exception {
         return persistent(super.joinClientStaticCacheConfigurationDifferentOnBothTemplate());
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder staticCacheConfigurationOnJoinTemplate() throws Exception {
         return persistent(super.staticCacheConfigurationOnJoinTemplate());
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder staticCacheConfigurationInClusterTemplate() throws Exception {
         return persistent(super.staticCacheConfigurationInClusterTemplate());
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder staticCacheConfigurationSameOnBothTemplate() throws Exception {
         return persistent(super.staticCacheConfigurationSameOnBothTemplate());
     }
 
+    /** {@inheritDoc} */
     @Override public AbstractNodeJoinTemplate.JoinNodeTestPlanBuilder staticCacheConfigurationDifferentOnBothTemplate() throws Exception {
         return persistent(super.staticCacheConfigurationDifferentOnBothTemplate());
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTrackerPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTrackerPluginProvider.java
index 8523fcf..a06bba7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTrackerPluginProvider.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/memtracker/PageMemoryTrackerPluginProvider.java
@@ -154,6 +154,7 @@
         }
     }
 
+    /** {@inheritDoc} */
     @Override public void beforeBinaryMemoryRestore(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {
         if (plugin != null) {
             try {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
index fac035f..2bdf175 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
@@ -49,6 +49,7 @@
     /** */
     public static final int GRID_CNT = 3;
 
+    /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         stopAllGrids();
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
index 06e6ac5..7d40c47 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
@@ -56,6 +56,7 @@
  * Indexing Spi query only test
  */
 public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest {
+    /** */
     private IndexingSpi indexingSpi;
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
index fa8f6c2..7d20e94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
@@ -865,6 +865,7 @@
      */
     private static class CacheInvokeListener implements CacheEntryUpdatedListener<QueryTestKey, QueryTestValue>,
         CacheEntryCreatedListener<QueryTestKey, QueryTestValue>, Serializable {
+        /** */
         @IgniteInstanceResource
         private Ignite ignite;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
index 11da098..19c0656 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
@@ -562,6 +562,7 @@
      *
      */
     private static class StoreFactory implements Factory<CacheStore> {
+        /** {@inheritDoc} */
         @Override public CacheStore create() {
             return new TestStore();
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
index 5e6d623..ada36cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
@@ -235,6 +235,7 @@
         }
     }
 
+    /** */
     private void executeQuery(IgniteCache<Integer, String> cache, ContinuousQuery<Integer, String> qry,
         boolean isTransactional) {
         try (QueryCursor<Cache.Entry<Integer, String>> qryCursor = cache.query(qry)) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index c9e9a4c..0714a64 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -1884,7 +1884,14 @@
      *
      */
     protected enum ContinuousDeploy {
-        CLIENT, SERVER, ALL
+        /** */
+        CLIENT,
+
+        /** */
+        SERVER,
+
+        /** */
+        ALL
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
index d16ffb1..54b1a95 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
@@ -458,6 +458,7 @@
      */
     @IgniteAsyncCallback
     private static class LocalEventListenerAsync extends LocalEventListener {
+        /** */
         LocalEventListenerAsync(AtomicInteger transCnt, CountDownLatch transUpdCnt) {
             super(transCnt, transUpdCnt);
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
index 93fc66f..3b020b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
@@ -687,6 +687,7 @@
         }
     }
 
+    /** */
     @SuppressWarnings({"unchecked", "ThrowableNotThrown"})
     private void checkExplicitMvccInvoke(Ignite node, IgniteCache cache, TransactionConcurrency txConcurrency,
         TransactionIsolation txIsolation) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 67f185c..e106c9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -1375,6 +1375,7 @@
      *
      */
     private static class StoreFactory implements Factory<CacheStore> {
+        /** {@inheritDoc} */
         @Override public CacheStore create() {
             return new TestStore();
         }
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 1d679a3..753c8a4 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
@@ -61,6 +61,7 @@
         return cfg;
     }
 
+    /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java
index 77d91b6..bcf6f86 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java
@@ -485,6 +485,7 @@
         });
     }
 
+    /** */
     private void hashToIndexAdvancedDistributionAssertion(int hash, int size) {
         int idx = store.resolveFlusherByKeyHash(hash);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
index 6fd7ad2..f89f2de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
@@ -76,6 +76,7 @@
     /** {@inheritDoc} */
     @Override protected boolean writeBehindCoalescing() { return false; }
 
+    /** */
     private static Random rnd = new Random();
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
index 9b7c61f..f956adc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
@@ -1132,8 +1132,13 @@
 
     /** */
     private enum TxState {
-        /** Prepare. */ PREPARE,
-        /** Assign. */ ASSIGN,
-        /** Commit. */COMMIT
+        /** Prepare. */
+        PREPARE,
+
+        /** Assign. */
+        ASSIGN,
+
+        /** Commit. */
+        COMMIT
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterStateChangeEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterStateChangeEventTest.java
index 12f89d5..a7c0fe2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterStateChangeEventTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterStateChangeEventTest.java
@@ -81,8 +81,8 @@
         super.afterTest();
     }
 
-    @Test
     /** */
+    @Test
     public void test() throws Exception {
         IgniteEx crd = grid(0);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/TestDistibutedConfigurationPlugin.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/TestDistibutedConfigurationPlugin.java
index b13721a..b486a9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/TestDistibutedConfigurationPlugin.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/TestDistibutedConfigurationPlugin.java
@@ -30,6 +30,7 @@
     /** */
     private GridKernalContext igniteCtx;
 
+    /** */
     public static Consumer<GridKernalContext> supplier = (ctx) -> {
     };
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index e7941d1..d268ce3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -1086,6 +1086,7 @@
         doTestMassivePut(true);
     }
 
+    /** */
     @Test
     public void testMassivePut2_false() throws Exception {
         MAX_PER_PAGE = 2;
@@ -1103,6 +1104,7 @@
         doTestMassivePut(true);
     }
 
+    /** */
     @Test
     public void testMassivePut3_false() throws Exception {
         MAX_PER_PAGE = 3;
@@ -1257,6 +1259,7 @@
         assertNoLocks();
     }
 
+    /** */
     private void doTestCursor(boolean canGetRow) throws IgniteCheckedException {
         TestTree tree = createTestTree(canGetRow);
 
@@ -1441,6 +1444,7 @@
         doTestSizeForRandomPutRmvMultithreaded(4);
     }
 
+    /** */
     @Test
     public void testSizeForRandomPutRmvMultithreaded_3_256() throws Exception {
         MAX_PER_PAGE = 3;
@@ -3055,6 +3059,7 @@
         }
     }
 
+    /** */
     private static class TestPageLockListener implements PageLockListener {
         /** */
         static ConcurrentMap<Object, Long> beforeReadLock = new ConcurrentHashMap<>();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java
index 6b27cb3..371128f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java
@@ -719,6 +719,7 @@
             return value(ctx, cpy, null);
         }
 
+        /** {@inheritDoc} */
         @Override public <T> @Nullable T value(CacheObjectValueContext ctx, boolean cpy, ClassLoader ldr) {
             return (T)data;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
index 59029d2..bb018d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
@@ -113,6 +113,7 @@
         }
     }
 
+    /** */
     private void doPutRemoveAll(Random rnd, IgniteCache<Integer, DbValue> cache, Map<Integer, DbValue> map,
         int keysCnt, boolean grow) {
         int putCnt = grow ? 20 + rnd.nextInt(10) : 1 + rnd.nextInt(5);
@@ -873,6 +874,7 @@
             assertEquals(map.get(entry.getKey()), entry.getValue());
     }
 
+    /** */
     @Test
     public void testPutGetRemoveMultipleBackward() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
@@ -1211,6 +1213,7 @@
         }
     }
 
+    /** */
     private void checkEmpty(final GridCacheAdapter internalCache, final Object key) throws Exception {
         if (internalCache.isNear()) {
             checkEmpty(((GridNearCacheAdapter)internalCache).dht(), key);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 3adc07f..6598e3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -97,6 +97,7 @@
     /** */
     private TestStore store;
 
+    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStorageClassloadingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStorageClassloadingTest.java
index 21a308f..74ad0a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStorageClassloadingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/metastorage/DistributedMetaStorageClassloadingTest.java
@@ -166,13 +166,15 @@
      * Class that would be excluded on the certain npde.
      */
     public static final class BamboozleClass implements Serializable {
-
+        /** */
         private final int i;
 
+        /** */
         public BamboozleClass(int i) {
             this.i = i;
         }
 
+        /** */
         public int getI() {
             return i;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
index 68eea5a..b6ff5b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
@@ -247,6 +247,7 @@
      * Test service.
      */
     private static class TestService implements Service {
+        /** */
         @LoggerResource
         private IgniteLogger log;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/HostAndPortRangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/HostAndPortRangeTest.java
index 1299e32..81b5152 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/HostAndPortRangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/HostAndPortRangeTest.java
@@ -127,6 +127,7 @@
         assertEquals(expected, actual);
     }
 
+    /** */
     @Rule
     public ExpectedException expectedEx = ExpectedException.none();
 
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 2ab8f97..02cc099 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
@@ -751,6 +751,7 @@
         assertTrue(ips.get(ips.size() - 1).isUnresolved());
     }
 
+    /** */
     @Test
     public void testMD5Calculation() throws Exception {
         String md5 = U.calculateMD5(new ByteArrayInputStream("Corrupted information.".getBytes()));
@@ -1482,31 +1483,46 @@
      * Test enum.
      */
     private enum TestEnum {
+        /** */
         E1,
+
+        /** */
         E2,
+
+        /** */
         E3
     }
 
+    /** */
     @Documented @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)
     private @interface Ann1 {}
 
+    /** */
     @Documented @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)
     private @interface Ann2 {}
 
+    /** */
     private static class A1 implements I3, I5 {}
 
+    /** */
     private static class A2 extends A1 {}
 
+    /** */
     private static class A3 implements I5 {}
 
+    /** */
     @Ann1 private interface I1 {}
 
+    /** */
     private interface I2 extends I1 {}
 
+    /** */
     private interface I3 extends I2 {}
 
+    /** */
     @Ann2 private interface I4 {}
 
+    /** */
     private interface I5 extends I4 {}
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
index 112b59f..6bbd3b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/collection/BitSetIntSetTest.java
@@ -70,6 +70,7 @@
         testIterator(1024);
     }
 
+    /** */
     @Test(expected = NoSuchElementException.class)
     public void shouldThrowExceptionIfHasNotNextElement() {
         IntSet intSet = new BitSetIntSet(2);
@@ -82,6 +83,7 @@
         iterator.next();
     }
 
+    /** */
     @Test
     public void hasNextShouldBeIdempotent() {
         IntSet intSet = new BitSetIntSet(3);
@@ -102,6 +104,7 @@
         assertEquals(3, (int) iter.next());
     }
 
+    /** */
     @Test
     public void toIntArray() {
         IntSet emptySet = new BitSetIntSet();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
index e67b3b1..59ce0f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/IgniteFutureImplTest.java
@@ -604,13 +604,16 @@
 
         final CountDownLatch latch = new CountDownLatch(1);
 
+        /** */
         class TestClosure implements CI1<IgniteFuture<Integer>> {
             private final CountDownLatch latch;
 
+            /** */
             private TestClosure(CountDownLatch latch) {
                 this.latch = latch;
             }
 
+            /** {@inheritDoc} */
             @Override public void apply(IgniteFuture<Integer> fut) {
                 assertEquals(CUSTOM_THREAD_NAME, Thread.currentThread().getName());
                 assertEquals(10, (int)fut.get());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadWithCorruptedLibFileTestRunner.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadWithCorruptedLibFileTestRunner.java
index 0ec09b3..f77e9c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadWithCorruptedLibFileTestRunner.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadWithCorruptedLibFileTestRunner.java
@@ -25,8 +25,10 @@
  * Helper class for {@link IpcSharedMemoryNativeLoaderSelfTest#testLoadWithCorruptedLibFile()} test, which contains test logic.
  */
 public class LoadWithCorruptedLibFileTestRunner {
+    /** */
     public static final String TMP_DIR_FOR_TEST = System.getProperty("user.home");
 
+    /** */
     public static final String LOADED_LIB_FILE_NAME = System.mapLibraryName(IpcSharedMemoryNativeLoader.LIB_NAME);
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestServer.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestServer.java
index 38e29ea..097c70a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestServer.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/SharedMemoryTestServer.java
@@ -31,6 +31,7 @@
  * to be used with conjunction to {@link GridJavaProcess}.
  */
 public class SharedMemoryTestServer {
+    /** */
     @SuppressWarnings({"BusyWait", "InfiniteLoopStatement"})
     public static void main(String[] args) throws IgniteCheckedException {
         System.out.println("Starting server ...");
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java
index faf1ae3..e209a06 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterLoadTest.java
@@ -34,6 +34,7 @@
         super(/*start grid*/false);
     }
 
+    /** */
     private static final String KEY_VALUE = "test";
 
     /**
@@ -58,6 +59,7 @@
         doTest(6, "no meta         ", dic);
     }
 
+    /** */
     public void doTest(int c, String message, String[] dic) throws IgniteInterruptedCheckedException {
         UUID[] uuids = new UUID[10];
 
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridSystemCurrentTimeMillisTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridSystemCurrentTimeMillisTest.java
index 19df31e..463026b 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/GridSystemCurrentTimeMillisTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/GridSystemCurrentTimeMillisTest.java
@@ -47,6 +47,7 @@
      *
      */
     private static class Timer implements Runnable {
+        /** */
         @SuppressWarnings({"BusyWait", "InfiniteLoopStatement"})
         @Override public void run() {
             while (true) {
@@ -66,6 +67,7 @@
      *
      */
     private static class Client implements Runnable {
+        /** */
         @SuppressWarnings({"BusyWait", "InfiniteLoopStatement"})
         @Override public void run() {
             int readsCnt = 0;
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java
index 451d417..b3ea7e5 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java
@@ -482,6 +482,7 @@
         }
     }
 
+    /** */
     private static class Pair {
         /** */
         private int a;
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
index c7fd1b4..5993a1f 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
@@ -85,6 +85,7 @@
         }
     }
 
+    /** */
     private static void printHeap(long init) {
         MemoryUsage heap = mem.getHeapMemoryUsage();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
index 5bf67ea..d87d5ff 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java
@@ -34,6 +34,7 @@
     /** */
     private static AtomicLong id = new AtomicLong();
 
+    /** */
     private static Thread t;
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java
index 1361be1..b3270f1 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java
@@ -160,6 +160,7 @@
         /** */
         private final BinaryObject bo;
 
+        /** */
         public FieldTestCallable(BinaryObject bo) {
             this.bo = bo;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerEnumDeadlockMultiJvmTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerEnumDeadlockMultiJvmTest.java
index 411b173..7ae0f0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerEnumDeadlockMultiJvmTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerEnumDeadlockMultiJvmTest.java
@@ -85,6 +85,7 @@
         return true;
     }
 
+    /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         stopAllGrids();
     }
@@ -177,7 +178,10 @@
 
     /** */
     public enum DeclaredBodyEnum {
+        /** */
         ONE,
+
+        /** */
         TWO {
             /** {@inheritDoc} */
             @Override public boolean isSupported() {
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java
index 0aae23e..fd0f825 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java
@@ -55,6 +55,7 @@
     @Parameterized.Parameter(0)
     public Integer allowSuccessfulClassRequestsCnt;
 
+    /** */
     @Parameterized.Parameters(name = "{0}")
     public static List<Integer> allowSuccessfulClassRequestsCntList() {
         return asList(0, 1);
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessor.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessor.java
index 7ba7b86..7ef35cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessor.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessor.java
@@ -26,6 +26,7 @@
  * Entry processor that adds argument to cache entry.
  */
 public class PlatformAddArgEntryProcessor implements CacheEntryProcessor<Object, Long, Long> {
+    /** {@inheritDoc} */
     @Override public Long process(MutableEntry<Object, Long> mutableEntry, Object... args)
             throws EntryProcessorException {
         Long val = (Long)args[0];
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessorBinarizable.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessorBinarizable.java
index f409081..d2921f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessorBinarizable.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformAddArgEntryProcessorBinarizable.java
@@ -27,6 +27,7 @@
  */
 public class PlatformAddArgEntryProcessorBinarizable
         implements CacheEntryProcessor<Object, Long, PlatformComputeBinarizable> {
+    /** {@inheritDoc} */
     @Override public PlatformComputeBinarizable process(MutableEntry<Object, Long> mutableEntry, Object... args)
             throws EntryProcessorException {
         Long val = (Long)args[0];
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeDecimalTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeDecimalTask.java
index 56bdf71..72bebdf 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeDecimalTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeDecimalTask.java
@@ -35,6 +35,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+/** */
 @SuppressWarnings({"ConstantConditions"})
 public class PlatformComputeDecimalTask extends ComputeTaskAdapter<Object[], BigDecimal> {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEnum.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEnum.java
index 0f20f8c..c3ce935 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEnum.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEnum.java
@@ -22,7 +22,12 @@
  */
 public enum PlatformComputeEnum
 {
+    /** */
     FOO,
+
+    /** */
     BAR,
+
+    /** */
     BAZ
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePutAffinityKeyTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePutAffinityKeyTask.java
index e384ec5..b14e3c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePutAffinityKeyTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePutAffinityKeyTask.java
@@ -47,6 +47,7 @@
 
     /** Job. */
     private static class PutJob extends ComputeJobAdapter {
+        /** */
         @IgniteInstanceResource
         private Ignite ignite;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java
index 449de12..bdb4823 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java
@@ -110,6 +110,7 @@
      * Test service.
      */
     public static class PlatformTestService implements Service {
+        /** */
         @IgniteInstanceResource
         private Ignite ignite;
 
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 b205a48..0a75ec5 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
@@ -73,6 +73,7 @@
         /** Stream ptr. */
         private final long ptr;
 
+        /** */
         private final ClusterNode node;
 
         /**
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformStringTestTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformStringTestTask.java
index fda2b83..f0ce6e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformStringTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformStringTestTask.java
@@ -48,6 +48,7 @@
      * Job.
      */
     private static class StringTestTaskJob extends ComputeJobAdapter {
+        /** */
         private final String arg;
 
         /**
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/model/ACL.java b/modules/core/src/test/java/org/apache/ignite/platform/model/ACL.java
index 6f75846..6543cd5 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/model/ACL.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/model/ACL.java
@@ -19,5 +19,9 @@
 
 /** Test enum. */
 public enum ACL {
-    ALLOW, DENY
+    /** */
+    ALLOW,
+
+    /** */
+    DENY
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/model/Account.java b/modules/core/src/test/java/org/apache/ignite/platform/model/Account.java
index d192ce7..3c9d561 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/model/Account.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/model/Account.java
@@ -31,6 +31,7 @@
     public Account() {
     }
 
+    /** */
     public Account(String id, int amount) {
         this.id = id;
         this.amount = amount;
@@ -56,6 +57,7 @@
         this.amount = amount;
     }
 
+    /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (this == o)
             return true;
@@ -65,6 +67,7 @@
         return Objects.equals(id, account.id);
     }
 
+    /** {@inheritDoc} */
     @Override public int hashCode() {
         return Objects.hash(id);
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java
index 1cd11de..8a70512 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java
@@ -28,6 +28,7 @@
     /** */
     private static final int SPI_COUNT = 4;
 
+    /** */
     private static TcpCommunicationSpi spis[] = new TcpCommunicationSpi[SPI_COUNT];
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java
index 7fee1f0..1e32a0a 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java
@@ -137,9 +137,11 @@
         /** */
         private static final long serialVersionUID = 0L;
 
+        /** */
         @IgniteInstanceResource
         private transient Ignite ignite;
 
+        /** */
         @LoggerResource
         private IgniteLogger log;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMetricsWarnLogTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMetricsWarnLogTest.java
index e6b6beb..b48cba3 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMetricsWarnLogTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMetricsWarnLogTest.java
@@ -110,6 +110,7 @@
         assertTrue(logLsnr2.check());
     }
 
+    /** */
     @Test
     @WithSystemProperty(key = IGNITE_DISCOVERY_METRICS_QNT_WARN, value = "0")
     public void testMetricsWarningLog0() throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java
index d187dac..33defd6 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeJoinAndFailureTest.java
@@ -64,8 +64,10 @@
     /** */
     private TcpDiscoveryIpFinder specialIpFinder1;
 
+    /** */
     private UUID nodeId;
 
+    /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestSafeThreadFactory.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestSafeThreadFactory.java
index 8ebec13..3349286 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestSafeThreadFactory.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestSafeThreadFactory.java
@@ -40,7 +40,7 @@
     /** Collection to hold all started threads across the JVM. */
     private static final BlockingQueue<Thread> startedThreads = new LinkedBlockingQueue<>();
 
-    /* Lock protection of the started across the JVM threads collection. */
+    /** Lock protection of the started across the JVM threads collection. */
     private static final GridBusyLock startedThreadsLock = new GridBusyLock();
 
     /** Threads name prefix. */
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 3800cfb..9bfa47c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -2021,10 +2021,12 @@
         return factory;
     }
 
+    /** */
     public static String keyStorePassword() {
         return GridTestProperties.getProperty("ssl.keystore.password");
     }
 
+    /** */
     @NotNull public static String keyStorePath(String keyStore) {
         return U.resolveIgnitePath(GridTestProperties.getProperty(
             "ssl.keystore." + keyStore + ".path")).getAbsolutePath();
@@ -2125,7 +2127,9 @@
     public static void benchmark(@Nullable String name, long warmup, long executionTime, @NotNull Runnable run) {
         final AtomicBoolean stop = new AtomicBoolean();
 
+        /** */
         class Stopper extends TimerTask {
+            /** {@inheritDoc} */
             @Override public void run() {
                 stop.set(true);
             }
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
index 1daeab4..d9b8bf2 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
@@ -39,14 +39,31 @@
 
     /** */
     public enum Feature {
+        /** */
         CACHE_STORE,
+
+        /** */
         NEAR_CACHE,
+
+        /** */
         LOCAL_CACHE,
+
+        /** */
         ENTRY_LOCK,
+
+        /** */
         CACHE_EVENTS,
+
+        /** */
         EVICTION,
+
+        /** */
         EXPIRATION,
+
+        /** */
         METRICS,
+
+        /** */
         INTERCEPTOR
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index d06f2f2..4d3e9ad 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -1104,6 +1104,7 @@
         /** */
         private final String cacheName;
 
+        /** */
         public ManualRebalancer(String cacheName) {
             this.cacheName = cacheName;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java
index 8192ead..b71d37d 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java
@@ -258,6 +258,7 @@
         return compute.call(new SizeLongTask(cacheName, isAsync, peekModes, false));
     }
 
+    /** {@inheritDoc} */
     @Override public IgniteFuture<Long> sizeLongAsync(CachePeekMode... peekModes) throws CacheException {
         return compute.callAsync(new SizeLongTask(cacheName, isAsync, peekModes, false));
     }
@@ -267,6 +268,7 @@
         return compute.call(new PartitionSizeLongTask(cacheName, isAsync, peekModes, partition, false));
     }
 
+    /** {@inheritDoc} */
     @Override public IgniteFuture<Long> sizeLongAsync(int partition, CachePeekMode... peekModes) throws CacheException {
         return compute.callAsync(new PartitionSizeLongTask(cacheName, isAsync, peekModes, partition, false));
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index 97e0569..b275b98 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -522,10 +522,12 @@
         throw new UnsupportedOperationException("Operation isn't supported yet.");
     }
 
+    /** {@inheritDoc} */
     @Override public boolean isRebalanceEnabled() {
         return true;
     }
 
+    /** {@inheritDoc} */
     @Override public void rebalanceEnabled(boolean rebalanceEnabled) {
         throw new UnsupportedOperationException("Operation isn't supported yet.");
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
index 8fd0f3f..555dc6b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
@@ -714,6 +714,7 @@
         }
     }
 
+    /** */
     private static class SecurityPermissionSetImpl implements SecurityPermissionSet {
         /** Serial version uid. */
         private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/test/java/org/apache/ignite/thread/GridThreadPoolExecutorServiceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/thread/GridThreadPoolExecutorServiceSelfTest.java
index 9615894..d9a59f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/thread/GridThreadPoolExecutorServiceSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/thread/GridThreadPoolExecutorServiceSelfTest.java
@@ -169,6 +169,7 @@
      *
      */
     private static final class IsInterruptedAssertionCallable implements Callable<Boolean> {
+        /** {@inheritDoc} */
         @Override public Boolean call() throws Exception {
             return Thread.currentThread().isInterrupted();
         }
@@ -178,6 +179,7 @@
      *
      */
     private static final class InterruptingRunnable implements Runnable {
+        /** {@inheritDoc} */
         @Override public void run() {
             Thread.currentThread().interrupt();
         }
@@ -187,6 +189,7 @@
      *
      */
     private final class TestRunnable implements Runnable {
+        /** {@inheritDoc} */
         @Override public void run() {
             try {
                 Thread.sleep(1000);
diff --git a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
index ae44e72..b6f9e47 100644
--- a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
+++ b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
@@ -299,6 +299,7 @@
      * Parse command line arguments and return filled IgniteWalConverterArguments
      *
      * @param args Command line arguments.
+     * @param out Out print stream.
      * @return IgniteWalConverterArguments.
      */
     public static IgniteWalConverterArguments parse(final PrintStream out, String... args) {
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentCachePluginConfiguration.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentCachePluginConfiguration.java
index 76cb971..ee31868 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentCachePluginConfiguration.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentCachePluginConfiguration.java
@@ -29,6 +29,7 @@
  * Test cache plugin configuration for cache deployment tests.
  */
 public class CacheDeploymentCachePluginConfiguration<K, V> implements CachePluginConfiguration<K, V> {
+    /** */
     private static class CacheDeploymentCachePluginProvider implements CachePluginProvider {
         /** {@inheritDoc} */
         @Nullable @Override public Object createComponent(Class cls) {
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentStoreSessionListenerFactory.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentStoreSessionListenerFactory.java
index 32ba38a..c385d94 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentStoreSessionListenerFactory.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentStoreSessionListenerFactory.java
@@ -43,6 +43,7 @@
         this.name = name;
     }
 
+    /** {@inheritDoc} */
     @Override public CacheStoreSessionListener create() {
         return new CacheDeploymentSessionListener(name);
     }
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestEnumValue.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestEnumValue.java
index cc70e2d..8aee265 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestEnumValue.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestEnumValue.java
@@ -21,8 +21,13 @@
  * Test enum for cache deployment tests.
  */
 public enum CacheDeploymentTestEnumValue {
+    /** */
     ONE("one"),
+
+    /** */
     TWO("two"),
+
+    /** */
     THREE("three");
 
     /** */
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/NodeFilter.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/NodeFilter.java
index 39eb8a8..ed55c51 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/NodeFilter.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/NodeFilter.java
@@ -24,6 +24,7 @@
  *
  */
 public class NodeFilter implements IgnitePredicate<ClusterNode> {
+    /** {@inheritDoc} */
     @Override public boolean apply(ClusterNode node) {
         return true;
     }
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Address.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Address.java
index ccd14cb..7669d51 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Address.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Address.java
@@ -25,31 +25,39 @@
 /**
  */
 public class Address implements Externalizable {
+    /** */
     private String street;
 
+    /** */
     private int house;
 
+    /** */
     public Address() {
     }
 
+    /** */
     public Address(String street, int house) {
         this.street = street;
         this.house = house;
     }
 
+    /** */
     public String getStreet() {
         return street;
     }
 
+    /** */
     public int getHouse() {
         return house;
     }
 
+    /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         out.writeObject(street);
         out.writeInt(house);
     }
 
+    /** */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         street = (String)in.readObject();
         house = in.readInt();
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Organization.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Organization.java
index 90c2c7a..9247768 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Organization.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/Organization.java
@@ -29,20 +29,24 @@
     /** Address. */
     Address addr;
 
+    /** */
     public Organization(String title, Person head, Address addr) {
         this.title = title;
         this.head = head;
         this.addr = addr;
     }
 
+    /** */
     public String getTitle() {
         return title;
     }
 
+    /** */
     public Person getHead() {
         return head;
     }
 
+    /** */
     public Address getAddr() {
         return addr;
     }
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
index 2655e39..b887ee65 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/PersonWrapper.java
@@ -24,6 +24,7 @@
  * Wraps Person class.
  */
 public class PersonWrapper {
+    /** */
     public static class Person implements Serializable {
         /** */
         @QuerySqlField
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java
index b7ab2c3..e2db550 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/compute/AveragePersonSalaryCallable.java
@@ -129,6 +129,7 @@
         assert Double.compare(avgSalary, amount / (to - from)) == 0;
     }
 
+    /** */
     private boolean isTxCache(IgniteCache<Integer, Person> cache) {
         CacheConfiguration<Integer, Person> ccfg = cache.getConfiguration(CacheConfiguration.class);
 
diff --git a/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java b/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
index 8c1cbe9..a82fcab 100644
--- a/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
+++ b/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
@@ -71,6 +71,7 @@
         return val + 1;
     }
 
+    /** {@inheritDoc} */
     @Override public long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException {
         return reader.readString().length();
     }
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java
index 1783e7b..df71641 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GarHelloWorldTask.java
@@ -81,6 +81,7 @@
         return jobs;
     }
 
+    /** {@inheritDoc} */
     @Nullable @Override public String reduce(List<ComputeJobResult> results) throws IgniteException {
         return String.valueOf(results.size());
     }
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
index 6128477..627dae2 100644
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
+++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
@@ -70,6 +70,7 @@
         return cfg;
     }
 
+    /** */
     private CacheConfiguration cacheConfiguration(String cacheName) {
         CacheConfiguration cfg = new CacheConfiguration();
         cfg.setName(cacheName);
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
index 49d01f6..fa2b96f 100644
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
+++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
@@ -23,6 +23,7 @@
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.processors.cache.integration.IgniteCacheStoreNodeRestartAbstractTest;
 
+/** */
 public class CacheHibernateBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest {
     /** {@inheritDoc} */
     @Override protected CacheStore getStore() {
diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
index 7c944f1..a032f10 100644
--- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
+++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
@@ -70,6 +70,7 @@
         return cfg;
     }
 
+    /** */
     private CacheConfiguration cacheConfiguration(String cacheName) {
         CacheConfiguration cfg = new CacheConfiguration();
         cfg.setName(cacheName);
diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
index 49d01f6..fa2b96f 100644
--- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
+++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
@@ -23,6 +23,7 @@
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.processors.cache.integration.IgniteCacheStoreNodeRestartAbstractTest;
 
+/** */
 public class CacheHibernateBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest {
     /** {@inheritDoc} */
     @Override protected CacheStore getStore() {
diff --git a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java
index 1501f67..fe6237a 100644
--- a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java
+++ b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java
@@ -43,7 +43,13 @@
     /** Strategy factory. */
     private HibernateAccessStrategyFactory stgyFactory;
 
-    /** */
+    /**
+     * @param regionCfg Domain data region configuration.
+     * @param regionFactory Region factory.
+     * @param defKeysFactory Default cache keys factory.
+     * @param buildingCtx Domain data region building context.
+     * @param stgyFactory Access strategy factory.
+     */
     public IgniteDomainDataRegion(DomainDataRegionConfig regionCfg,
         RegionFactory regionFactory,
         CacheKeysFactory defKeysFactory,
diff --git a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java
index da1fcd7..cb0ac22 100644
--- a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java
+++ b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java
@@ -34,7 +34,14 @@
     /** Strategy access type. */
     private final AccessType accessType;
 
-    /** */
+    /**
+     * @param stgy Access strategy adapter.
+     * @param accessType Access type.
+     * @param regionFactory Region factory.
+     * @param domainDataRegion Domain data region.
+     * @param ignite Ignite instance.
+     * @param cache Hibernate cache proxy.
+     */
     public IgniteEntityDataAccess(
         HibernateAccessStrategyAdapter stgy,
         AccessType accessType,
diff --git a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java
index cc2075b..39152f5 100644
--- a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java
+++ b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java
@@ -35,7 +35,14 @@
     /** Strategy access type. */
     private final AccessType accessType;
 
-    /** */
+    /**
+     * @param stgy Access strategy adapter.
+     * @param accessType Access type.
+     * @param regionFactory Region factory.
+     * @param domainDataRegion Domain data region.
+     * @param ignite Ignite instance.
+     * @param cache Cache proxy.
+     */
     public IgniteNaturalIdDataAccess(
         HibernateAccessStrategyAdapter stgy,
         AccessType accessType,
diff --git a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteTimestampsRegion.java b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteTimestampsRegion.java
index 3524f35..e1d1e3b 100644
--- a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteTimestampsRegion.java
+++ b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteTimestampsRegion.java
@@ -31,6 +31,7 @@
      * @param factory Region factory.
      * @param regionName Region name.
      * @param cache Region cache.
+     * @param ignite Ignite instance.
      */
     public IgniteTimestampsRegion(RegionFactory factory, String regionName, Ignite ignite, HibernateCacheProxy cache) {
         super(factory, regionName, ignite, cache);
diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
index bcb7360..f19d934 100644
--- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
@@ -263,6 +263,7 @@
         }
     }
 
+    /** */
     private <T> List<T> getResultsList(Session ses, Class<T> entityClass) {
         CriteriaBuilder builder = ses.getCriteriaBuilder();
         CriteriaQuery<T> query = builder.createQuery(entityClass);
diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
index e7b0c56..1216f3e 100644
--- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
+++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
@@ -68,6 +68,7 @@
         return cfg;
     }
 
+    /** */
     private CacheConfiguration cacheConfiguration(String cacheName) {
         CacheConfiguration cfg = new CacheConfiguration();
         cfg.setName(cacheName);
diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
index 49d01f6..fa2b96f 100644
--- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
+++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
@@ -23,6 +23,7 @@
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.processors.cache.integration.IgniteCacheStoreNodeRestartAbstractTest;
 
+/** */
 public class CacheHibernateBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest {
     /** {@inheritDoc} */
     @Override protected CacheStore getStore() {
diff --git a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
index 68e56b8f..8a0a48e 100644
--- a/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
+++ b/modules/hibernate-5.3/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
@@ -229,6 +229,7 @@
         @Override public void close() throws HibernateException {
         }
 
+        /** {@inheritDoc} */
         @Override public Map<String, Object> getProperties() {
             return null;
         }
@@ -243,18 +244,22 @@
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public PersistenceUnitUtil getPersistenceUnitUtil() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public void addNamedQuery(String name, Query query) {
 
         }
 
+        /** {@inheritDoc} */
         @Override public <T> T unwrap(Class<T> cls) {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
 
         }
@@ -284,34 +289,42 @@
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public <T> List<EntityGraph<? super T>> findEntityGraphsByType(Class<T> aClass) {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public EntityManager createEntityManager() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public EntityManager createEntityManager(Map map) {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public EntityManager createEntityManager(SynchronizationType synchronizationType) {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public CriteriaBuilder getCriteriaBuilder() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public Metamodel getMetamodel() {
             return null;
         }
 
+        /** {@inheritDoc} */
         @Override public boolean isOpen() {
             return false;
         }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2QueryInfo.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2QueryInfo.java
index f3ba68b..2a62fc9 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2QueryInfo.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2QueryInfo.java
@@ -134,8 +134,13 @@
      * Query type.
      */
     public enum QueryType {
+        /** */
         LOCAL,
+
+        /** */
         MAP,
+
+        /** */
         REDUCE
     }
 }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlOperationType.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlOperationType.java
index e8b2d34..f2d1271 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlOperationType.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlOperationType.java
@@ -25,39 +25,86 @@
  */
 public enum GridSqlOperationType {
     // from org.h2.expression.Operation
+
+    /** */
     CONCAT(2, new BiExpressionSqlGenerator("||")),
+
+    /** */
     PLUS(2, new BiExpressionSqlGenerator("+")),
+
+    /** */
     MINUS(2, new BiExpressionSqlGenerator("-")),
+
+    /** */
     MULTIPLY(2, new BiExpressionSqlGenerator("*")),
+
+    /** */
     DIVIDE(2, new BiExpressionSqlGenerator("/")),
+
+    /** */
     MODULUS(2, new BiExpressionSqlGenerator("%")),
+
+    /** */
     NEGATE(1, new PrefixSqlGenerator("-", true)),
 
     // from org.h2.expression.Comparison
+
+    /** */
     EQUAL(2, new BiExpressionSqlGenerator("=")),
+
+    /** */
     EQUAL_NULL_SAFE(2, new BiExpressionSqlGenerator("IS")),
+
+    /** */
     BIGGER_EQUAL(2, new BiExpressionSqlGenerator(">=")),
+
+    /** */
     BIGGER(2, new BiExpressionSqlGenerator(">")),
+
+    /** */
     SMALLER_EQUAL(2, new BiExpressionSqlGenerator("<=")),
+
+    /** */
     SMALLER(2, new BiExpressionSqlGenerator("<")),
+
+    /** */
     NOT_EQUAL(2, new BiExpressionSqlGenerator("<>")),
+
+    /** */
     NOT_EQUAL_NULL_SAFE(2, new BiExpressionSqlGenerator("IS NOT")),
 
+    /** */
     SPATIAL_INTERSECTS(2, new IntersectsSqlGenerator()),
+
+    /** */
     IS_NULL(1, new SuffixSqlGenerator("IS NULL")),
+
+    /** */
     IS_NOT_NULL(1, new SuffixSqlGenerator("IS NOT NULL")),
 
+    /** */
     NOT(1, new PrefixSqlGenerator("NOT", true)),
 
     // from org.h2.expression.ConditionAndOr
+
+    /** */
     AND(2, new BiExpressionSqlGenerator("AND")),
+
+    /** */
     OR(2, new BiExpressionSqlGenerator("OR")),
 
     // from
+
+    /** */
     REGEXP(2, new BiExpressionSqlGenerator("REGEXP")),
+
+    /** */
     LIKE(2, new BiExpressionSqlGenerator("LIKE")),
 
+    /** */
     IN(-1, new ConditionInSqlGenerator()),
+
+    /** */
     EXISTS(1, new PrefixSqlGenerator("EXISTS", false));
 
     /** */
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
index 808ff9e..223df69 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
@@ -243,6 +243,7 @@
         return 4;
     }
 
+    /** {@inheritDoc} */
     @Override public void onAckReceived() {
         // No-op
     }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java
index 375db9c..4e16dd5 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java
@@ -83,26 +83,31 @@
         return colCfg.name();
     }
 
+    /** */
     @Order(4)
     public byte maxPartitionObsolescencePercent() {
         return objCfg.maxPartitionObsolescencePercent();
     }
 
+    /** */
     @Order(5)
     public Long manualNulls() {
         return (colCfg.overrides() == null) ? null : colCfg.overrides().nulls();
     }
 
+    /** */
     @Order(6)
     public Long manualDistinct() {
         return (colCfg.overrides() == null) ? null : colCfg.overrides().distinct();
     }
 
+    /** */
     @Order(7)
     public Long manualTotal() {
         return (colCfg.overrides() == null) ? null : colCfg.overrides().total();
     }
 
+    /** */
     @Order(8)
     public Integer manualSize() {
         return (colCfg.overrides() == null) ? null : colCfg.overrides().size();
diff --git a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java
index 664be99..aa6119c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlIndexView.java
@@ -31,7 +31,10 @@
     /** Index. */
     private final IndexInformation idx;
 
-    /** */
+    /**
+     * @param tbl H2 table implementation.
+     * @param idx Index information.
+     */
     public SqlIndexView(GridH2Table tbl, IndexInformation idx) {
         this.tbl = tbl;
         this.idx = idx;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlViewView.java b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlViewView.java
index ab36dc3..aceac67 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlViewView.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/view/SqlViewView.java
@@ -33,19 +33,19 @@
         this.view = view;
     }
 
-    /** View name. */
+    /** @return View name. */
     @Order
     public String name() {
         return view.getTableName();
     }
 
-    /** View description. */
+    /** @return View description. */
     @Order(2)
     public String description() {
         return view.getDescription();
     }
 
-    /** View schema. */
+    /** @return View schema. */
     @Order(1)
     public String schema() {
         return QueryUtils.SCHEMA_SYS;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsInMemoryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsInMemoryTest.java
index 06ca0a6..64687ec 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsInMemoryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsInMemoryTest.java
@@ -23,6 +23,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+/** */
 public class IndexPagesMetricsInMemoryTest extends AbstractIndexPageMetricsTest {
     /** {@inheritDoc} */
     @Override boolean isPersistenceEnabled() {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsPersistentTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsPersistentTest.java
index e8d7aa7..ef6edbd 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsPersistentTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/metric/IndexPagesMetricsPersistentTest.java
@@ -26,6 +26,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+/** */
 public class IndexPagesMetricsPersistentTest extends AbstractIndexPageMetricsTest {
     /** {@inheritDoc} */
     @Override boolean isPersistenceEnabled() {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java
index 65c62c5..d42977e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryAfterDynamicCacheStartFailureTest.java
@@ -23,6 +23,7 @@
 import org.apache.ignite.cache.query.SqlQuery;
 import org.apache.ignite.configuration.CacheConfiguration;
 
+/** */
 public class CacheQueryAfterDynamicCacheStartFailureTest extends IgniteAbstractDynamicCacheStartFailTest {
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeDoesNotBreakSqlSelectTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeDoesNotBreakSqlSelectTest.java
index 70fe42c..41748ad 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeDoesNotBreakSqlSelectTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeDoesNotBreakSqlSelectTest.java
@@ -67,8 +67,8 @@
         cleanPersistenceDir();
     }
 
-    @Test
     /** */
+    @Test
     public void test() throws Exception {
         Ignite crd = startGridsMultiThreaded(2);
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index ce072ed..514f6d7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -471,6 +471,7 @@
         @QuerySqlField
         private int productId;
 
+        /** */
         @QuerySqlField
         private int price;
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index cd1fb05..a398252 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -458,6 +458,7 @@
         assertEquals(0, meta.scale());
     }
 
+    /** */
     @Test
     public void testExecuteWithMetaDataAndCustomKeyPrecision() throws Exception {
         QueryEntity qeWithPrecision = new QueryEntity()
@@ -718,10 +719,12 @@
         assert cnt == 2;
     }
 
+    /** */
     protected boolean isReplicatedOnly() {
         return false;
     }
 
+    /** */
     private SqlFieldsQuery sqlFieldsQuery(String sql) {
         SqlFieldsQuery qry = new SqlFieldsQuery(sql);
 
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 a290e9c..ddbc4f5 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
@@ -2426,6 +2426,7 @@
      *
      */
     private static class StoreFactory implements Factory<CacheStore> {
+        /** {@inheritDoc} */
         @Override public CacheStore create() {
             return store;
         }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
index c1e9bf6..ac7c935 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
@@ -219,6 +219,7 @@
         }
     }
 
+    /** */
     @Test
     public void testManyTables() {
         Ignite ignite = ignite(0);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
index 4432c8e..d9ef662 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -97,7 +97,9 @@
         }
     }
 
+    /** */
     private static class Person {
+        /** */
         @QuerySqlField
         private String name;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
index ba62d1d..21db4d3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
@@ -43,6 +43,7 @@
 public class IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest
     extends IgniteCacheLockPartitionOnAffinityRunAbstractTest {
 
+    /** */
     private static volatile boolean cancelAllJobs = false;
 
     /** {@inheritDoc} */
@@ -135,6 +136,7 @@
      *
      */
     private static class TestRun implements IgniteRunnable {
+        /** */
         private int jobNum;
 
         /** Ignite Logger. */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java
index 5d9cdd2..b93df8d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java
@@ -120,13 +120,16 @@
      * Test cache value.
      */
     private static class CacheValue {
+        /** */
         @QuerySqlField
         private final int val;
 
+        /** */
         CacheValue(int val) {
             this.val = val;
         }
 
+        /** */
         int value() {
             return val;
         }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlInsertValidationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlInsertValidationSelfTest.java
index a966d97..94113a7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlInsertValidationSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlInsertValidationSelfTest.java
@@ -273,16 +273,21 @@
         return cache;
     }
 
+    /** */
     private static class Key {
+        /** */
         private long fk1;
 
+        /** */
         private long fk2;
 
+        /** */
         public Key(long fk1, long fk2) {
             this.fk1 = fk1;
             this.fk2 = fk2;
         }
 
+        /** {@inheritDoc} */
         @Override public boolean equals(Object o) {
             if (this == o)
                 return true;
@@ -293,49 +298,65 @@
                 fk2 == key.fk2;
         }
 
+        /** {@inheritDoc} */
         @Override public int hashCode() {
             return Objects.hash(fk1, fk2);
         }
     }
 
+    /** */
     private static class SuperKey {
+        /** */
         @QuerySqlField
         private long superKeyId;
 
+        /** */
         @QuerySqlField
         private NestedKey nestedKey;
 
+        /** */
         public SuperKey(long superKeyId, NestedKey nestedKey) {
             this.superKeyId = superKeyId;
             this.nestedKey = nestedKey;
         }
     }
 
+    /** */
     private static class NestedKey {
+        /** */
         @QuerySqlField
         private String name;
 
+        /** */
         public NestedKey(String name) {
             this.name = name;
         }
     }
 
+    /** */
     private static class Val {
+        /** */
         private long fv1;
 
+        /** */
         private long fv2;
 
+        /** */
         public Val(long fv1, long fv2) {
             this.fv1 = fv1;
             this.fv2 = fv2;
         }
     }
 
+    /** */
     private static class Val2 {
+        /** */
         private long fv1;
 
+        /** */
         private long fv2;
 
+        /** */
         public Val2(long fv1, long fv2) {
             this.fv1 = fv1;
             this.fv2 = fv2;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicSqlRestoreTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicSqlRestoreTest.java
index 600cbdf..10f8712 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicSqlRestoreTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicSqlRestoreTest.java
@@ -56,9 +56,10 @@
  */
 @SuppressWarnings("Duplicates")
 public class IgniteDynamicSqlRestoreTest extends GridCommonAbstractTest implements Serializable {
-
+    /** */
     public static final String TEST_CACHE_NAME = "test";
 
+    /** */
     public static final String TEST_INDEX_OBJECT = "TestIndexObject";
 
     /** {@inheritDoc} */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java
index ecf39a5..28b482e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java
@@ -106,6 +106,7 @@
         return cache;
     }
 
+    /** */
     private void destroyCache() {
         grid(0).destroyCache("person");
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java
index 4932665..99aefd5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java
@@ -376,9 +376,11 @@
      *
      */
     private static class Person implements Serializable {
+        /** */
         @QuerySqlField(index = true)
         int id;
 
+        /** */
         Person(int id) {
             this.id = id;
         }
@@ -388,12 +390,15 @@
      *
      */
     private static class Purchase implements Serializable {
+        /** */
         @QuerySqlField(index = true)
         int personId;
 
+        /** */
         @QuerySqlField(index = true)
         int productId;
 
+        /** */
         Purchase(int personId, int productId) {
             this.personId = personId;
             this.productId = productId;
@@ -404,9 +409,11 @@
      *
      */
     private static class Company implements Serializable {
+        /** */
         @QuerySqlField(index = true)
         int id;
 
+        /** */
         Company(int id) {
             this.id = id;
         }
@@ -416,12 +423,15 @@
      *
      */
     private static class Product implements Serializable {
+        /** */
         @QuerySqlField(index = true)
         int id;
 
+        /** */
         @QuerySqlField(index = true)
         int companyId;
 
+        /** */
         Product(int id, int companyId) {
             this.id = id;
             this.companyId = companyId;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
index ffae2b5..e899f30 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
@@ -563,9 +563,11 @@
 
     /** */
     protected static class DepositKey extends RegionKey {
+        /** */
         @QuerySqlField(index = true)
         protected int depositId;
 
+        /** */
         @QuerySqlField(index = true)
         protected int clientId;
 
@@ -611,27 +613,33 @@
 
     /** */
     protected static class Client {
+        /** */
         @QuerySqlField
         protected String firstName;
 
+        /** */
         @QuerySqlField
         protected String lastName;
 
+        /** */
         @QuerySqlField(index = true)
         protected int passport;
     }
 
     /** */
     protected static class Deposit {
+        /** */
         @QuerySqlField
         protected long amount;
     }
 
     /** */
     protected static class Region {
+        /** */
         @QuerySqlField
         protected String name;
 
+        /** */
         @QuerySqlField
         protected int code;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java
index 3271c15..9b01eed 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java
@@ -64,6 +64,7 @@
         "where pr.companyId = co._key\n" +
         "order by co._key, pr._key ";
 
+    /** */
     protected static final String QRY_LONG = "select pe.id, co.id, pr._key\n" +
         "from \"pe\".Person pe, \"pr\".Product pr, \"co\".Company co, \"pu\".Purchase pu\n" +
         "where pe._key = pu.personId and pu.productId = pr._key and pr.companyId = co._key \n" +
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
index 51870b7..e7aae7b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
@@ -693,6 +693,7 @@
      */
     @SuppressWarnings("unused")
     private static class KeyClass2 {
+        /** */
         @QuerySqlField
         private String keyField2;
     }
@@ -702,6 +703,7 @@
      */
     @SuppressWarnings("unused")
     private static class ValueClass2 {
+        /** */
         @QuerySqlField
         private String valField2;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
index baeade3..9b7a94c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
@@ -203,6 +203,7 @@
      * Blocking indexing processor.
      */
     private static class BlockingIndexing extends IgniteH2Indexing {
+        /** {@inheritDoc} */
         @Override public void remove(GridCacheContext cctx, GridQueryTypeDescriptor type,
             CacheDataRow row) throws IgniteCheckedException {
             U.sleep(50);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java
index d5a2e4f..b9420f6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java
@@ -77,14 +77,20 @@
 public class CacheMvccTxRecoveryTest extends CacheMvccAbstractTest {
     /** */
     public enum TxEndResult {
-        /** */ COMMIT,
-        /** */ ROLLBAK
+        /** */
+        COMMIT,
+
+        /** */
+        ROLLBAK
     }
 
     /** */
     public enum NodeMode {
-        /** */ SERVER,
-        /** */ CLIENT
+        /** */
+        SERVER,
+
+        /** */
+        CLIENT
     }
 
     /** {@inheritDoc} */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
index 9373839..c75ab48 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
@@ -1913,10 +1913,13 @@
      * BigObject for test purposes that don't fit in page size.
      */
     private static class BigObject {
+        /** */
         private final int index;
 
+        /** */
         private final byte[] payload = new byte[4096];
 
+        /** */
         BigObject(int index) {
             this.index = index;
             // Create pseudo-random array.
@@ -1925,6 +1928,7 @@
                     payload[i] = (byte)index;
         }
 
+        /** {@inheritDoc} */
         @Override public boolean equals(Object o) {
             if (this == o)
                 return true;
@@ -1935,6 +1939,7 @@
                 Arrays.equals(payload, bigObject.payload);
         }
 
+        /** {@inheritDoc} */
         @Override public int hashCode() {
             return Objects.hash(index, payload);
         }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheSizeTtlTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheSizeTtlTest.java
index b4095a0..30f5922 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheSizeTtlTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheSizeTtlTest.java
@@ -91,6 +91,7 @@
             getTestTimeout()));
     }
 
+    /** */
     private static Ignite startIgniteServer() {
         IgniteConfiguration configuration = new IgniteConfiguration()
             .setClientMode(false)
@@ -100,6 +101,7 @@
         return Ignition.start(configuration);
     }
 
+    /** */
     private static Ignite startIgniteClient() {
         IgniteConfiguration configuration = new IgniteConfiguration()
             .setClientMode(true)
@@ -108,6 +110,7 @@
         return Ignition.start(configuration);
     }
 
+    /** */
     @NotNull
     private static CacheConfiguration<String, LocalDateTime> cacheConfiguration() {
         return new CacheConfiguration<String, LocalDateTime>()
@@ -117,6 +120,7 @@
             .setExpiryPolicyFactory(ModifiedExpiryPolicy.factoryOf(ENTRY_EXPIRY_DURATION));
     }
 
+    /** */
     private static TcpDiscoverySpi discoveryConfiguration() {
         TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder();
         ipFinder.setAddresses(singleton("127.0.0.1:48550..48551"));
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/IgniteDataStreamerTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/IgniteDataStreamerTest.java
index 57021aa..7eb65a9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/IgniteDataStreamerTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/IgniteDataStreamerTest.java
@@ -34,10 +34,13 @@
 /**
  */
 public class IgniteDataStreamerTest extends GridCommonAbstractTest {
+    /** */
     public static final String CACHE_NAME = "UUID_CACHE";
 
+    /** */
     public static final int DATA_SIZE = 3;
 
+    /** */
     public static final long WAIT_TIMEOUT = 30_000L;
 
     /** {@inheritDoc} */
@@ -50,6 +53,7 @@
         awaitPartitionMapExchange();
     }
 
+    /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java
index af0181e..3f68c2e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingPutGetTest.java
@@ -180,11 +180,13 @@
         cntr.addAndGet(inc ? 1 : -1);
     }
 
+    /** */
     @SuppressWarnings("unchecked")
     private static <X> X queryOne(IgniteCache<?, ?> cache, String qry) {
         return (X)cache.query(new SqlFieldsQuery(qry)).getAll().get(0).get(0);
     }
 
+    /** */
     private static int querySize(IgniteCache<?, ?> cache, String qry) {
         return cache.query(new SqlFieldsQuery(qry)).getAll().size();
     }
@@ -207,6 +209,7 @@
         return cfg;
     }
 
+    /** */
     static class Abc {
         /** */
         @QuerySqlField
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
index 7ad4ad6..1ef3dca 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
@@ -43,6 +43,7 @@
         return cfg;
     }
 
+    /** {@inheritDoc} */
     @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
         CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
index f9b91fb..bb4fe80 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
@@ -91,6 +91,7 @@
         }, 1, "restart-thread");
     }
 
+    /** {@inheritDoc} */
     @Override protected int countRebalances(int nodes, int restarts) {
         return 0;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java
index 532915a..7b205ab 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java
@@ -889,6 +889,7 @@
         @QuerySqlField(index = true)
         private long id;
 
+        /** */
         @QuerySqlField(index = true)
         private long persId;
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java
index 6d9851e..804684c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java
@@ -121,6 +121,7 @@
         super.afterTest();
     }
 
+    /** */
     private CacheConfiguration buildCacheConfiguration(String name) {
         if (name.equals(NODE_BAD_CONF_MISS_KEY_FIELD)) {
             CacheConfiguration ccfg = new CacheConfiguration(NODE_BAD_CONF_MISS_KEY_FIELD);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java
index 687b5ac..1678a1e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSchemaIndexingTest.java
@@ -238,6 +238,7 @@
         @QuerySqlField
         private int id;
 
+        /** */
         @QuerySqlField
         private String name;
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
index e6e1d2d..5a2da7e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
@@ -333,7 +333,9 @@
         }
     }
 
+    /** */
     private static class PersonKey {
+        /** */
         @QuerySqlField
         int id;
 
@@ -342,6 +344,7 @@
         @QuerySqlField
         Integer orgId;
 
+        /** */
         public PersonKey(int id, Integer orgId) {
             this.id = id;
             this.orgId = orgId;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 26b6a7f..eb9bc23 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -412,21 +412,25 @@
         }
     }
 
+    /** */
     @Test
     public void testPartitionedTablesUsingReplicatedCache() {
         doTestPartitionedTablesUsingReplicatedCache(1, false);
     }
 
+    /** */
     @Test
     public void testPartitionedTablesUsingReplicatedCacheSegmented() {
         doTestPartitionedTablesUsingReplicatedCache(7, false);
     }
 
+    /** */
     @Test
     public void testPartitionedTablesUsingReplicatedCacheClient() {
         doTestPartitionedTablesUsingReplicatedCache(1, true);
     }
 
+    /** */
     @Test
     public void testPartitionedTablesUsingReplicatedCacheSegmentedClient() {
         doTestPartitionedTablesUsingReplicatedCache(7, true);
@@ -519,6 +523,7 @@
         }
     }
 
+    /** */
     @SuppressWarnings("SuspiciousMethodCalls")
     @Test
     public void testExists() {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RemoveConstantsFromQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RemoveConstantsFromQueryTest.java
index 1f96727..a48a15f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RemoveConstantsFromQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RemoveConstantsFromQueryTest.java
@@ -62,6 +62,7 @@
         QueryUtils.INCLUDE_SENSITIVE = false;
     }
 
+    /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
index 8dc167c..d503332 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
@@ -343,6 +343,7 @@
      * Person key.
      */
     public static class PersonKey {
+        /** */
         @QuerySqlField
         public long id;
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
index dde19f5..2cfe6b8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java
@@ -1843,19 +1843,25 @@
         }
     }
 
+    /** */
     private static class CustomNodeFilter implements IgnitePredicate<ClusterNode> {
+        /** */
         private final int attemptsBeforeException;
 
+        /** */
         private volatile int attempts;
 
+        /** */
         public CustomNodeFilter(int attemptsBeforeException) {
             this.attemptsBeforeException = attemptsBeforeException;
         }
 
+        /** {@inheritDoc} */
         @Override public boolean apply(ClusterNode node) {
             return true;
         }
 
+        /** {@inheritDoc} */
         @Override public String toString() {
             if (attempts++ > attemptsBeforeException)
                 throw new NullPointerException("Oops... incorrect customer realization.");
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java
index 26de2d6..2eb26e3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java
@@ -60,8 +60,10 @@
  * Tesing index full and partial rebuild.
  */
 public class GridIndexRebuildTest extends GridCommonAbstractTest {
+    /** */
     public static final String FIRST_CACHE = "cache1";
 
+    /** */
     public static final String SECOND_CACHE = "cache2";
 
     /** */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
index 6f58aaf..0de1631 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
@@ -188,6 +188,7 @@
         }
     }
 
+    /** */
     private void doTestConcurrentUpdates(boolean enableMvcc) throws Exception {
         final String cacheName = "test_updates";
 
@@ -340,12 +341,14 @@
         doTestLazySql(serverCache, keysCnt);
     }
 
+    /** */
     private void doTestLazySql(IgniteCache<Long, TestData> cache, int keysCnt) {
         checkLazySql(cache, false, keysCnt);
         checkLazySql(cache, true, keysCnt);
         checkLazySql(cache, null, keysCnt);
     }
 
+    /** */
     private void checkLazySql(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled, int keysCnt) {
         CacheDataTree.isLastFindWithDataPageScan();
 
@@ -388,6 +391,7 @@
         }
     }
 
+    /** */
     private void doTestDml(IgniteCache<Long, TestData> cache) {
         // SQL query (data page scan must be enabled by default).
         DirectPageScanIndexing.callsCnt.set(0);
@@ -406,6 +410,7 @@
         assertEquals(++callsCnt, DirectPageScanIndexing.callsCnt.get());
     }
 
+    /** */
     private void checkDml(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled) {
         DirectPageScanIndexing.expectedDataPageScanEnabled = dataPageScanEnabled;
 
@@ -417,6 +422,7 @@
         checkSqlLastFindDataPageScan(dataPageScanEnabled);
     }
 
+    /** */
     private void checkSqlLastFindDataPageScan(Boolean dataPageScanEnabled) {
         if (dataPageScanEnabled == FALSE)
             assertNull(CacheDataTree.isLastFindWithDataPageScan()); // HashIdx was not used.
@@ -424,6 +430,7 @@
             assertTrue(CacheDataTree.isLastFindWithDataPageScan());
     }
 
+    /** */
     private void doTestSqlQuery(IgniteCache<Long, TestData> cache) {
         // SQL query (data page scan must be enabled by default).
         DirectPageScanIndexing.callsCnt.set(0);
@@ -442,6 +449,7 @@
         assertEquals(++callsCnt, DirectPageScanIndexing.callsCnt.get());
     }
 
+    /** */
     private void checkSqlQuery(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled) {
         DirectPageScanIndexing.expectedDataPageScanEnabled = dataPageScanEnabled;
 
@@ -454,6 +462,7 @@
         checkSqlLastFindDataPageScan(dataPageScanEnabled);
     }
 
+    /** */
     private void doTestScanQuery(IgniteCache<Long, TestData> cache, int keysCnt) {
         // Scan query (data page scan must be disabled by default).
         TestPredicate.callsCnt.set(0);
@@ -476,6 +485,7 @@
         assertEquals(callsCnt += keysCnt, TestPredicate.callsCnt.get());
     }
 
+    /** */
     private void checkScanQuery(IgniteCache<Long, TestData> cache, Boolean dataPageScanEnabled, Boolean expLastDataPageScan) {
         assertTrue(cache.query(new ScanQuery<>(new TestPredicate())).getAll().isEmpty());
         assertEquals(expLastDataPageScan, CacheDataTree.isLastFindWithDataPageScan());
@@ -569,29 +579,36 @@
      * Externalizable class to make it non-binary.
      */
     static class Person implements Externalizable {
+        /** */
         String name;
 
+        /** */
         int age;
 
+        /** */
         public Person() {
             // No-op
         }
 
+        /** */
         Person(String name, int age) {
             this.name = Objects.requireNonNull(name);
             this.age = age;
         }
 
+        /** {@inheritDoc} */
         @Override public void writeExternal(ObjectOutput out) throws IOException {
             out.writeUTF(name);
             out.writeInt(age);
         }
 
+        /** {@inheritDoc} */
         @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
             name = in.readUTF();
             age = in.readInt();
         }
 
+        /** */
         static LinkedHashMap<String, String> getFields() {
             LinkedHashMap<String, String> m = new LinkedHashMap<>();
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/RowCountTableStatisticsUsageTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/RowCountTableStatisticsUsageTest.java
index 44db684..36a6eb8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/RowCountTableStatisticsUsageTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/RowCountTableStatisticsUsageTest.java
@@ -48,6 +48,7 @@
         });
     }
 
+    /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         Ignite node = startGridsMultiThreaded(2);
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 390093c..973d1ab 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -718,11 +718,13 @@
         }
     }
 
+    /** */
     @QuerySqlFunction
     public static int cool1() {
         return 1;
     }
 
+    /** */
     @QuerySqlFunction
     public static ResultSet table0(Connection c, String a, int b) throws SQLException {
         return c.createStatement().executeQuery("select '" + a + "' as a, " + b + " as b");
@@ -957,12 +959,15 @@
      * Address class. Stored at replicated cache.
      */
     private static class Address implements Serializable {
+        /** */
         @QuerySqlField(index = true)
         private int id;
 
+        /** */
         @QuerySqlField(index = true)
         private String street;
 
+        /** */
         Address(int id, String street) {
             this.id = id;
             this.street = street;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 4a8b06e..b770cf7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -1035,11 +1035,13 @@
         assertSqlEquals(U.firstNotNull(prepared.getPlanSQL(), prepared.getSQL()), res);
     }
 
+    /** */
     @QuerySqlFunction
     public static int cool1() {
         return 1;
     }
 
+    /** */
     @QuerySqlFunction
     public static ResultSet table0(Connection c, String a, int b) throws SQLException {
         return c.createStatement().executeQuery("select '" + a + "' as a, " + b + " as b");
@@ -1063,21 +1065,27 @@
      *
      */
     public static class Person implements Serializable {
+        /** */
         @QuerySqlField(index = true)
         public Date date = new Date(System.currentTimeMillis());
 
+        /** */
         @QuerySqlField(index = true)
         public String name = "Ivan";
 
+        /** */
         @QuerySqlField(index = true)
         public String parentName;
 
+        /** */
         @QuerySqlField(index = true)
         public int addrId;
 
+        /** */
         @QuerySqlField
         public Integer[] addrIds;
 
+        /** */
         @QuerySqlField(index = true)
         public int old;
     }
@@ -1086,12 +1094,15 @@
      *
      */
     public static class Address implements Serializable {
+        /** */
         @QuerySqlField(index = true)
         public int id;
 
+        /** */
         @QuerySqlField(index = true)
         public int streetNumber;
 
+        /** */
         @QuerySqlField(index = true)
         public String street = "Nevskiy";
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
index 5d7dd32..bc688cb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/H2CompareBigQueryTest.java
@@ -767,6 +767,7 @@
             return id;
         }
 
+        /** */
         public Object key(boolean useColocatedData) {
             return useColocatedData ? new AffinityKey<>(id, rootOrderId) : id;
         }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractPartitionPruningBaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractPartitionPruningBaseTest.java
index 30dee0f..2628d65 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractPartitionPruningBaseTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/AbstractPartitionPruningBaseTest.java
@@ -460,6 +460,7 @@
      * TCP communication SPI which will track outgoing query requests.
      */
     private static class TrackingTcpCommunicationSpi extends TcpCommunicationSpi {
+        /** {@inheritDoc} */
         @Override public void sendMessage(ClusterNode node, Message msg, IgniteInClosure<IgniteException> ackC) {
             if (msg instanceof GridIoMessage) {
                 GridIoMessage msg0 = (GridIoMessage)msg;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/JoinPartitionPruningSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/JoinPartitionPruningSelfTest.java
index 0bf774c..9315f2b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/JoinPartitionPruningSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/JoinPartitionPruningSelfTest.java
@@ -831,6 +831,7 @@
      * Custom node filter.
      */
     private static class CustomNodeFilter implements IgnitePredicate<ClusterNode> {
+        /** {@inheritDoc} */
         @Override public boolean apply(ClusterNode clusterNode) {
             return true;
         }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java
index 38d9fb0..08f6b9e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java
@@ -59,9 +59,11 @@
     /** */
     public static final StatisticsTarget T2_TARGET = new StatisticsTarget(T2_KEY, "t22");
 
+    /** */
     @Parameterized.Parameter(value = 0)
     public boolean persist;
 
+    /** */
     @Parameterized.Parameter(value = 1)
     public IgniteStatisticsRepository repo;
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/PSUValueDistributionTableStatisticsUsageTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/PSUValueDistributionTableStatisticsUsageTest.java
index 6c49eba..3be7eb2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/PSUValueDistributionTableStatisticsUsageTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/PSUValueDistributionTableStatisticsUsageTest.java
@@ -102,6 +102,7 @@
     }
 
     // TODO create Ignite mirror ticket and set it here
+    /** */
     @Ignore("https://ggsystems.atlassian.net/browse/GG-31183")
     @Test
     public void selectNotNullCond() {
@@ -132,6 +133,7 @@
         checkOptimalPlanChosenForDifferentIndexes(grid(0), new String[]{"SIZED_SMALL_NULLS"}, sql2, new String[1][]);
     }
 
+    /** */
     @Ignore("https://issues.apache.org/jira/browse/IGNITE-14813")
     @Test
     public void selectWithValueSizeCond() {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteSQLColumnConstraintsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteSQLColumnConstraintsTest.java
index aee3a15..65f2c3d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteSQLColumnConstraintsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteSQLColumnConstraintsTest.java
@@ -87,6 +87,7 @@
             " DEFAULT 1.345)", INTERNAL_ERROR);
     }
 
+    /** */
     @Test
     public void testCreateTableWithTooLongDecimalDefault() throws Exception {
         checkSQLThrows("CREATE TABLE too_long_decimal_default(id INT PRIMARY KEY, val DECIMAL(4, 2)" +
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java
index 7d6150c..c347d07 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java
@@ -234,6 +234,7 @@
      * Key class.
      */
     private static class SqlConnectorKey {
+        /** */
         @QuerySqlField
         public int key;
     }
@@ -242,6 +243,7 @@
      * Value class.
      */
     private static class SqlConnectorValue {
+        /** */
         @QuerySqlField
         public int val;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
index 2d0c538..6fa906f8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
@@ -61,6 +61,7 @@
     /** */
     private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(30);
 
+    /** */
     public static final AtomicReference<Exception> error = new AtomicReference<>();
 
     /**
@@ -186,6 +187,7 @@
         @QuerySqlField
         private String lastName;
 
+        /** */
         public Person(int id, String firstName, String lastName) {
             this.id = id;
             this.firstName = firstName;
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/client/ThinClientKubernetesAddressFinder.java b/modules/kubernetes/src/main/java/org/apache/ignite/client/ThinClientKubernetesAddressFinder.java
index ba102b3..d61cf58 100644
--- a/modules/kubernetes/src/main/java/org/apache/ignite/client/ThinClientKubernetesAddressFinder.java
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/client/ThinClientKubernetesAddressFinder.java
@@ -47,12 +47,15 @@
      */
     private final int port;
 
-    /** */
+    /** @param cfg Kubernetes connection configuration. */
     public ThinClientKubernetesAddressFinder(KubernetesConnectionConfiguration cfg) {
         this(cfg, DFLT_PORT);
     }
 
-    /** */
+    /**
+     * @param cfg Kubernetes connection configuration.
+     * @param port Port that Ignite uses to listen client connections.
+     */
     public ThinClientKubernetesAddressFinder(KubernetesConnectionConfiguration cfg, int port) {
         resolver = new KubernetesServiceAddressResolver(cfg);
         this.port = port;
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/kubernetes/configuration/KubernetesConnectionConfiguration.java b/modules/kubernetes/src/main/java/org/apache/ignite/kubernetes/configuration/KubernetesConnectionConfiguration.java
index ffb5c16..7fa6cda 100644
--- a/modules/kubernetes/src/main/java/org/apache/ignite/kubernetes/configuration/KubernetesConnectionConfiguration.java
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/kubernetes/configuration/KubernetesConnectionConfiguration.java
@@ -53,7 +53,7 @@
     }
 
     /**
-     * Get Kubernetes service name.
+     * @return Kubernetes service name.
      */
     public String getServiceName() {
         return srvcName;
@@ -73,7 +73,7 @@
     }
 
     /**
-     * Get Kubernetes namespace.
+     * @return Kubernetes namespace.
      */
     public String getNamespace() {
         return namespace;
@@ -93,7 +93,7 @@
     }
 
     /**
-     * Get Kubernetes master url.
+     * @return Kubernetes master url.
      */
     public String getMaster() {
         return master;
@@ -113,7 +113,7 @@
     }
 
     /**
-     * Get Kubernetes account token.
+     * @return Kubernetes account token.
      */
     public String getAccountToken() {
         return accountToken;
@@ -132,7 +132,7 @@
     }
 
     /**
-     * Get flag include not ready addresses.
+     * @return Flag include not ready addresses.
      */
     public boolean getIncludeNotReadyAddresses() {
         return includeNotReadyAddresses;
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
index 7259cb2..f015c85 100644
--- a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
@@ -61,6 +61,8 @@
 
     /**
      * Creates an instance of Kubernetes IP finder.
+     *
+     * @param cfg Kubernetes IP finder configuration.
      */
     public TcpDiscoveryKubernetesIpFinder(KubernetesConnectionConfiguration cfg) {
         setShared(true);
@@ -90,6 +92,7 @@
     }
 
     /**
+     * @param service Kubernetes service name.
      * @deprecated set parameters with {@code KubernetesConnectionConfiguration} instead.
      */
     @Deprecated
@@ -98,6 +101,7 @@
     }
 
     /**
+     * @param namespace Namespace of the Kubernetes service.
      * @deprecated set parameters with {@code KubernetesConnectionConfiguration} instead.
      */
     @Deprecated
@@ -106,6 +110,7 @@
     }
 
     /**
+     * @param master Host name of the Kubernetes API server.
      * @deprecated set parameters with {@code KubernetesConnectionConfiguration} instead.
      */
     @Deprecated
@@ -114,6 +119,7 @@
     }
 
     /**
+     * @param accountToken Path to the service token file.
      * @deprecated set parameters with {@code KubernetesConnectionConfiguration} instead.
      */
     @Deprecated
@@ -122,6 +128,7 @@
     }
 
     /**
+     * @param includeNotReadyAddresses Whether addresses of not-ready pods should be included.
      * @deprecated set parameters with {@code KubernetesConnectionConfiguration} instead.
      */
     @Deprecated
diff --git a/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java
index df1bd78..ed468e5 100644
--- a/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java
+++ b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java
@@ -35,17 +35,18 @@
         // No-op.
     }
 
+    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         // No-op.
     }
 
-    /* {@inheritDoc} */
+    /** {@inheritDoc} */
     @Override protected TcpDiscoveryKubernetesIpFinder ipFinder() throws Exception {
         // No-op.
         return null;
     }
 
-    /* {@inheritDoc} */
+    /** {@inheritDoc} */
     @Test
     @Override public void testIpFinder() throws Exception {
         TcpDiscoveryKubernetesIpFinder ipFinder = new TcpDiscoveryKubernetesIpFinder();
diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
index 3bda57b..a7bb8f4 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
@@ -239,6 +239,8 @@
 
     /**
      * Sets CPU count limit.
+     *
+     * @param cpu CPU count limit.
      */
     public void cpus(double cpu) {
         this.cpu = cpu;
@@ -253,6 +255,8 @@
 
     /**
      * Sets CPU count limit.
+     *
+     * @param cpu CPU per node count limit.
      */
     public void cpusPerNode(double cpu) {
         this.cpuPerNode = cpu;
diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteTask.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteTask.java
index cb28cf1..391a381 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteTask.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteTask.java
@@ -76,6 +76,7 @@
         return disk;
     }
 
+    /** {@inheritDoc} */
     @Override public String toString() {
         return "IgniteTask " +
             "host: [" + host + ']' +
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java
index c3a13a1..9eefb74 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/ModelsComposition.java
@@ -55,6 +55,7 @@
         this.models = Collections.unmodifiableList(models);
     }
 
+    /** */
     public ModelsComposition() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBModel.java
index 35cb70e..217f5e8 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/boosting/GDBModel.java
@@ -63,9 +63,11 @@
         this.internalToExternalLblMapping = internalToExternalLblMapping;
     }
 
+    /** */
     private GDBModel() {
     }
 
+    /** */
     public GDBModel withLblMapping(IgniteFunction<Double, Double> internalToExternalLblMapping) {
         this.internalToExternalLblMapping = internalToExternalLblMapping;
         return this;
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java
index 257c635..f8a8f2b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregator.java
@@ -30,6 +30,7 @@
     /** Bias. */
     private double bias;
 
+    /** */
     public WeightedPredictionsAggregator() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/feature/extractor/Vectorizer.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/feature/extractor/Vectorizer.java
index 529de26..3258686 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/feature/extractor/Vectorizer.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/feature/extractor/Vectorizer.java
@@ -175,8 +175,11 @@
      * Shotrcuts for coordinates in feature vector.
      */
     public enum LabelCoordinate {
-        /** First. */FIRST,
-        /** Last. */LAST
+        /** First. */
+        FIRST,
+
+        /** Last. */
+        LAST
     }
 
     /** {@inheritDoc} */
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java
index 7aea3b9..a0d125d 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/parallelism/ParallelismStrategy.java
@@ -31,8 +31,11 @@
      * The type of parallelism.
      */
     public enum Type {
-        /** No parallelism. */NO_PARALLELISM,
-        /** On default pool. */ON_DEFAULT_POOL
+        /** No parallelism. */
+        NO_PARALLELISM,
+
+        /** On default pool. */
+        ON_DEFAULT_POOL
     }
 
     /**
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/inference/IgniteModelStorageUtil.java b/modules/ml/src/main/java/org/apache/ignite/ml/inference/IgniteModelStorageUtil.java
index 238d900..f9424e4 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/inference/IgniteModelStorageUtil.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/inference/IgniteModelStorageUtil.java
@@ -46,7 +46,7 @@
     /**
      *
      */
-    private IgniteModelStorageUtil(){
+    private IgniteModelStorageUtil() {
         // No-op.
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONModel.java
index ac73398..3a3bdc8 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONModel.java
@@ -49,6 +49,7 @@
         this.modelClass = modelClass;
     }
 
+    /** */
     @JsonCreator
     public JSONModel() {
     }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONWritable.java b/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONWritable.java
index fcc3037..c58a9aa 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONWritable.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JSONWritable.java
@@ -23,7 +23,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+/** */
 public interface JSONWritable {
+    /** */
     default void toJSON(Path path) {
         ObjectMapper mapper = new ObjectMapper().configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java b/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java
index 654ade4..3289b52 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java
@@ -24,7 +24,9 @@
 import java.util.Map;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+/** */
 public class JacksonHelper {
+    /** */
     public static void readAndValidateBasicJsonModelProperties(Path path, ObjectMapper mapper, String className) throws IOException {
         Map jsonAsMap = mapper.readValue(new File(path.toAbsolutePath().toString()), LinkedHashMap.class);
         String formatVersion = jsonAsMap.get("formatVersion").toString();
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java
index ac70874..7a22732 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ANNClassificationModel.java
@@ -280,6 +280,7 @@
         /** Centers of clusters. */
         public List<double[]> candidateFeatures;
 
+        /** */
         public ProbableLabel[] candidateLabels;
 
         /** Distance measure. */
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ProbableLabel.java b/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ProbableLabel.java
index 49f56b8..25cc992 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ProbableLabel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/knn/ann/ProbableLabel.java
@@ -27,6 +27,7 @@
     /** Key is label, value is probability to be this class */
     public TreeMap<Double, Double> clsLbls;
 
+    /** */
     public ProbableLabel() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java
index 2c32ee6..3572181 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/BrayCurtisDistance.java
@@ -52,6 +52,7 @@
     return getClass().hashCode();
   }
 
+  /** {@inheritDoc} */
   @Override public String toString() {
     return "BrayCurtisDistance{}";
   }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java
index ec48888..1fc5624 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/JensenShannonDistance.java
@@ -32,12 +32,15 @@
    */
   private static final long serialVersionUID = 1771556549784040093L;
 
+  /** */
   private final Double base;
 
+  /** */
   public JensenShannonDistance() {
     base = Math.E;
   }
 
+  /** */
   public JensenShannonDistance(Double base) {
     this.base = base;
   }
@@ -60,6 +63,7 @@
     return Math.sqrt(js / 2d);
   }
 
+  /** */
   private double relativeEntropy(double x, double y) {
     if (x > 0 && y > 0) {
       return x * Math.log(x / y);
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/MinkowskiDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/MinkowskiDistance.java
index 20c1c02..0b66a1b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/MinkowskiDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/MinkowskiDistance.java
@@ -56,6 +56,7 @@
         return Math.pow(result, 1 / p);
     }
 
+    /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (this == o)
             return true;
@@ -65,10 +66,12 @@
         return Double.compare(that.p, p) == 0;
     }
 
+    /** {@inheritDoc} */
     @Override public int hashCode() {
         return Objects.hash(p);
     }
 
+    /** {@inheritDoc} */
     @Override public String toString() {
         return "MinkowskiDistance{" +
             "p=" + p +
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java
index 61e2125..53f64f1 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistance.java
@@ -34,13 +34,17 @@
    */
   private static final long serialVersionUID = 1771556549784040096L;
 
+  /** */
   private int p = 1;
 
+  /** */
   private final double[] weights;
 
+  /** */
   @JsonIgnore
   private final Vector internalWeights;
 
+  /** */
   @JsonCreator
   public WeightedMinkowskiDistance(@JsonProperty("p")int p, @JsonProperty("weights")double[] weights) {
     this.p = p;
@@ -89,6 +93,7 @@
     return getClass().hashCode();
   }
 
+  /** {@inheritDoc} */
   @Override public String toString() {
     return "WeightedMinkowskiDistance{" +
         "p=" + p +
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/stat/DistributionMixture.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/stat/DistributionMixture.java
index 4a915fa..39b5cff 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/stat/DistributionMixture.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/stat/DistributionMixture.java
@@ -61,6 +61,7 @@
         this.dimension = dimension;
     }
 
+    /** */
     public DistributionMixture() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MapUtil.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MapUtil.java
index c632d1b..dca5a08 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MapUtil.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MapUtil.java
@@ -31,7 +31,7 @@
     /**
      *
      */
-    private MapUtil(){
+    private MapUtil() {
         // No-op.
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/compound/CompoundNaiveBayesModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/compound/CompoundNaiveBayesModel.java
index a9fc2d0..1f1c36b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/compound/CompoundNaiveBayesModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/compound/CompoundNaiveBayesModel.java
@@ -109,18 +109,22 @@
         return discreteModel;
     }
 
+    /** */
     public double[] getPriorProbabilities() {
         return priorProbabilities;
     }
 
+    /** */
     public double[] getLabels() {
         return labels;
     }
 
+    /** */
     public Collection<Integer> getGaussianFeatureIdsToSkip() {
         return gaussianFeatureIdsToSkip;
     }
 
+    /** */
     public Collection<Integer> getDiscreteFeatureIdsToSkip() {
         return discreteFeatureIdsToSkip;
     }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesSumsHolder.java b/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesSumsHolder.java
index 060d188..4245ff4 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesSumsHolder.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/discrete/DiscreteNaiveBayesSumsHolder.java
@@ -32,13 +32,16 @@
     /** Rows count for each label */
     Map<Double, Integer> featureCountersPerLbl = new HashMap<>();
 
+    /** */
     public DiscreteNaiveBayesSumsHolder() {
     }
 
+    /** */
     public Map<Double, long[][]> getValuesInBucketPerLbl() {
         return valuesInBucketPerLbl;
     }
 
+    /** */
     public Map<Double, Integer> getFeatureCountersPerLbl() {
         return featureCountersPerLbl;
     }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/gaussian/GaussianNaiveBayesSumsHolder.java b/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/gaussian/GaussianNaiveBayesSumsHolder.java
index 1d85832..90f20ff 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/gaussian/GaussianNaiveBayesSumsHolder.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/naivebayes/gaussian/GaussianNaiveBayesSumsHolder.java
@@ -35,17 +35,21 @@
     /** Rows count for each label */
     Map<Double, Integer> featureCountersPerLbl = new HashMap<>();
 
+    /** */
     public GaussianNaiveBayesSumsHolder() {
     }
 
+    /** */
     public Map<Double, double[]> getFeatureSumsPerLbl() {
         return featureSumsPerLbl;
     }
 
+    /** */
     public Map<Double, double[]> getFeatureSquaredSumsPerLbl() {
         return featureSquaredSumsPerLbl;
     }
 
+    /** */
     public Map<Double, Integer> getFeatureCountersPerLbl() {
         return featureCountersPerLbl;
     }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/structures/Dataset.java b/modules/ml/src/main/java/org/apache/ignite/ml/structures/Dataset.java
index 0c068ce..7ca27b0 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/structures/Dataset.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/structures/Dataset.java
@@ -43,7 +43,7 @@
     /**
      * Default constructor (required by Externalizable).
      */
-    public Dataset(){}
+    public Dataset() {}
 
     /**
      * Creates new Dataset by given data.
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/structures/DatasetRow.java b/modules/ml/src/main/java/org/apache/ignite/ml/structures/DatasetRow.java
index d511399..4dafc42 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/structures/DatasetRow.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/structures/DatasetRow.java
@@ -119,6 +119,7 @@
         vector.set(idx, val);
     }
 
+    /** */
     public V getVector() {
         return vector;
     }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVector.java
index 9b3ddde..f7cb655 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/structures/LabeledVector.java
@@ -99,6 +99,7 @@
         lb = (L)in.readObject();
     }
 
+    /** */
     public L getLb() {
         return lb;
     }
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java
index 0cadf53..e215db0 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/svm/SVMLinearClassificationModel.java
@@ -53,6 +53,7 @@
     /** Intercept of the linear regression model. */
     private double intercept;
 
+    /** */
     public SVMLinearClassificationModel() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeId.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeId.java
index a8bc849..47bdd28 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeId.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeId.java
@@ -45,6 +45,7 @@
         this.nodeId = nodeId;
     }
 
+    /** */
     public NodeId() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeSplit.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeSplit.java
index 8146df0..f195c17 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeSplit.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/NodeSplit.java
@@ -36,6 +36,7 @@
     /** Impurity at this split point. */
     private double impurity;
 
+    /** */
     public NodeSplit() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/RandomForestTreeModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/RandomForestTreeModel.java
index 563080a..355d2a7 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/RandomForestTreeModel.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/RandomForestTreeModel.java
@@ -48,6 +48,7 @@
         this.usedFeatures = usedFeatures;
     }
 
+    /** */
     public RandomForestTreeModel() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/TreeNode.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/TreeNode.java
index 7a480e6..01a4e2e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/TreeNode.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/randomforest/data/TreeNode.java
@@ -81,6 +81,7 @@
         this.depth = 1;
     }
 
+    /** */
     public TreeNode() {
     }
 
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java b/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java
index 333ade4..92011e2 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java
@@ -38,7 +38,7 @@
     /**
      *
      */
-    private Utils(){
+    private Utils() {
         // No-op.
     }
 
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregatorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregatorTest.java
index 863a8dd..79668d2 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregatorTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/composition/predictionsaggregator/WeightedPredictionsAggregatorTest.java
@@ -24,7 +24,7 @@
 
 /** */
 public class WeightedPredictionsAggregatorTest {
-
+    /** */
     public static final double[] EMPTY_DOUBLE_ARRAY = {};
 
     /** */
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/BrayCurtisDistanceTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/BrayCurtisDistanceTest.java
index 57ca7de..cad38c8 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/BrayCurtisDistanceTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/BrayCurtisDistanceTest.java
@@ -61,6 +61,7 @@
     );
   }
 
+  /** */
   private final TestData testData;
 
   /** */
@@ -79,19 +80,25 @@
         distanceMeasure.compute(testData.vectorA, testData.vectorB), PRECISION);
   }
 
+  /** */
   private static class TestData {
+    /** */
     public final Vector vectorA;
 
+    /** */
     public final Vector vectorB;
 
+    /** */
     public final double expRes;
 
+    /** */
     private TestData(double[] vectorA, double[] vectorB, double expRes) {
       this.vectorA = new DenseVector(vectorA);
       this.vectorB = new DenseVector(vectorB);
       this.expRes = expRes;
     }
 
+    /** {@inheritDoc} */
     @Override public String toString() {
       return String.format("d(%s,%s) = %s",
           Arrays.toString(vectorA.asArray()),
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/CanberraDistanceTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/CanberraDistanceTest.java
index c40251b..8de6e46 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/CanberraDistanceTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/CanberraDistanceTest.java
@@ -61,6 +61,7 @@
     );
   }
 
+  /** */
   private final TestData testData;
 
   /** */
@@ -79,19 +80,25 @@
         distanceMeasure.compute(testData.vectorA, testData.vectorB), PRECISION);
   }
 
+  /** */
   private static class TestData {
+    /** */
     public final Vector vectorA;
 
+    /** */
     public final Vector vectorB;
 
+    /** */
     public final double expRes;
 
+    /** */
     private TestData(double[] vectorA, double[] vectorB, double expRes) {
       this.vectorA = new DenseVector(vectorA);
       this.vectorB = new DenseVector(vectorB);
       this.expRes = expRes;
     }
 
+    /** */
     @Override public String toString() {
       return String.format("d(%s,%s) = %s",
           Arrays.toString(vectorA.asArray()),
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/JensenShannonDistanceTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/JensenShannonDistanceTest.java
index 763a362..6ad82d6 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/JensenShannonDistanceTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/JensenShannonDistanceTest.java
@@ -59,6 +59,7 @@
     );
   }
 
+  /** */
   private final TestData testData;
 
   /** */
@@ -77,15 +78,21 @@
         distanceMeasure.compute(testData.vectorA, testData.vectorB), PRECISION);
   }
 
+  /** */
   private static class TestData {
+    /** */
     public final Vector vectorA;
 
+    /** */
     public final Vector vectorB;
 
+    /** */
     public final Double expRes;
 
+    /** */
     public final Double base;
 
+    /** */
     private TestData(double[] vectorA, double[] vectorB, Double base, Double expRes) {
       this.vectorA = new DenseVector(vectorA);
       this.vectorB = new DenseVector(vectorB);
@@ -93,6 +100,7 @@
       this.expRes = expRes;
     }
 
+    /** {@inheritDoc} */
     @Override public String toString() {
       return String.format("d(%s,%s;%s) = %s",
           Arrays.toString(vectorA.asArray()),
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistanceTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistanceTest.java
index c6a1d18..739a4b1 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistanceTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/WeightedMinkowskiDistanceTest.java
@@ -62,6 +62,7 @@
     );
   }
 
+  /** */
   private final TestData testData;
 
   /** */
@@ -80,17 +81,24 @@
         distanceMeasure.compute(testData.vectorA, testData.vectorB), PRECISION);
   }
 
+  /** */
   private static class TestData {
+    /** */
     public final Vector vectorA;
 
+    /** */
     public final Vector vectorB;
 
+    /** */
     public final Integer p;
 
+    /** */
     public final double[] weights;
 
+    /** */
     public final Double expRes;
 
+    /** */
     private TestData(double[] vectorA, double[] vectorB, Integer p, double[] weights, double expRes) {
       this.vectorA = new DenseVector(vectorA);
       this.vectorB = new DenseVector(vectorB);
@@ -99,6 +107,7 @@
       this.expRes = expRes;
     }
 
+    /** {@inheritDoc} */
     @Override public String toString() {
       return String.format("d(%s,%s;%s,%s) = %s",
           Arrays.toString(vectorA.asArray()),
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorNormCasesTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorNormCasesTest.java
index 0392203..bc80a9f 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorNormCasesTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorNormCasesTest.java
@@ -26,6 +26,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+/** */
 @RunWith(Parameterized.class)
 public class VectorNormCasesTest {
   /**
@@ -33,6 +34,7 @@
    */
   private static final double PRECISION = 0.01;
 
+  /** */
   @Parameterized.Parameters(name = "{0}")
   public static Collection<TestData> data() {
     return Arrays.asList(
@@ -64,12 +66,15 @@
     );
   }
 
+  /** */
   private final TestData testData;
 
+  /** */
   public VectorNormCasesTest(TestData testData) {
     this.testData = testData;
   }
 
+  /** */
   @Test
   public void test() {
     assertEquals(
@@ -79,19 +84,25 @@
     );
   }
 
+  /** */
   private static class TestData {
+    /** */
     public final Vector vector;
 
+    /** */
     public final Double p;
 
+    /** */
     public final Double expRes;
 
+    /** */
     private TestData(double[] vector, double p, double expRes) {
       this.vector = new DenseVector(vector);
       this.p = p;
       this.expRes = expRes;
     }
 
+    /** {@inheritDoc} */
     @Override public String toString() {
       return String.format("norm(%s, %s) = %s",
           Arrays.toString(vector.asArray()),
diff --git a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusSpanAdapter.java b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusSpanAdapter.java
index 59f615a..14c577e 100644
--- a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusSpanAdapter.java
+++ b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusSpanAdapter.java
@@ -38,7 +38,7 @@
         this.span = span;
     }
 
-    /** Implementation object. */
+    /** @return Implementation object. */
     public io.opencensus.trace.Span impl() {
         return span;
     }
diff --git a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/StatusMatchTable.java b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/StatusMatchTable.java
index 7530152..4087633 100644
--- a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/StatusMatchTable.java
+++ b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/StatusMatchTable.java
@@ -43,6 +43,7 @@
 
     /**
      * @param spanStatus Span status.
+     * @return Opencensus analog ot the specified span status.
      */
     public static io.opencensus.trace.Status match(SpanStatus spanStatus) {
         io.opencensus.trace.Status res = table.get(spanStatus);
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java
index 394de68..34d0b9b 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java
@@ -103,5 +103,6 @@
         );
     }
 
+    /** */
     protected abstract List<String> featuresToInstall();
 }
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
index 57fc7db..c42e94f 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
@@ -40,6 +40,7 @@
     /** Number of features expected to exist. */
     private static final int EXPECTED_FEATURES = 25;
 
+    /** */
     private static final String CAMEL_REPO_URI = "mvn:org.apache.camel.karaf/apache-camel/" +
         System.getProperty("camelVersion") + "/xml/features";
 
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
index 4f875ed..d5ff95e 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
@@ -57,6 +57,7 @@
     @Inject @Filter("(ignite.name=testGrid)")
     private Ignite ignite;
 
+    /** */
     @Inject
     private BundleContext bundleCtx;
 
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index 1cb72fa..65d565c 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -257,6 +257,7 @@
         }
     }
 
+    /** */
     private static <T extends Enum<T>> @Nullable T enumValue(
         String key,
         Map<String, String> params,
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java
index 20b46b9..063c4db 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java
@@ -233,14 +233,19 @@
         cli.close();
     }
 
-    /** Sets Ignite client configuration. */
+    /**
+     * Sets Ignite client configuration.
+     *
+     * @param cfg Ignite thin client configuration.
+     * @return {@code this} for chaining.
+     */
     public IgniteClientSpringBean setClientConfiguration(ClientConfiguration cfg) {
         this.cfg = cfg;
 
         return this;
     }
 
-    /** Gets Ignite client configuration. */
+    /** @return Ignite client configuration. */
     public ClientConfiguration getClientConfiguration() {
         return cfg;
     }
@@ -249,6 +254,9 @@
      * Sets {@link SmartLifecycle} phase during which the current bean will be initialized. Note, underlying Ignite
      * client will be closed during handling of {@link DisposableBean} since {@link IgniteClient}
      * implements {@link AutoCloseable} interface.
+     *
+     * @param phase {@link SmartLifecycle} phase.
+     * @return {@code this} for chaining.
      */
     public IgniteClientSpringBean setPhase(int phase) {
         this.phase = phase;
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
index 3da53c1..369df26 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
@@ -228,6 +228,7 @@
                 @TestAnnotation
                 private String str6;
 
+                /** */
                 private Callable<String> c = new Callable<String>() {
                     @TestAnnotation
                     private String cStr;
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
index 03f75a9..9d70944 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
@@ -280,6 +280,7 @@
      * Dummy Service.
      */
     public interface DummyService {
+        /** */
         public void noop();
     }
 
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java
index 6f1b1a6..8084cbb 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/TestClosure.java
@@ -36,6 +36,7 @@
     @LoggerResource
     private IgniteLogger log;
 
+    /** {@inheritDoc} */
     @Override public Object apply(Object o) {
         Assert.assertNotNull(ignite);
         Assert.assertNotNull(log);
diff --git a/modules/spring/src/test/java/org/apache/ignite/spring/IgniteExcludeInConfigurationTest.java b/modules/spring/src/test/java/org/apache/ignite/spring/IgniteExcludeInConfigurationTest.java
index 9e24671..d9856f8 100644
--- a/modules/spring/src/test/java/org/apache/ignite/spring/IgniteExcludeInConfigurationTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/spring/IgniteExcludeInConfigurationTest.java
@@ -34,6 +34,7 @@
  * Checks excluding properties, beans with not existing classes in spring.
  */
 public class IgniteExcludeInConfigurationTest extends GridCommonAbstractTest {
+    /** */
     private URL cfgLocation = U.resolveIgniteUrl(
         "modules/spring/src/test/java/org/apache/ignite/spring/sprint-exclude.xml");
 
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
index 11d2574..404a85a 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
@@ -197,9 +197,8 @@
     }
 
     /**
-     * Returns URLs of class loader
-     *
      * @param clsLdr Class loader.
+     * @return URLs of class loader.
      */
     public static URL[] classLoaderUrls(ClassLoader clsLdr) {
         if (clsLdr == null)
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/AssertOnOrphanedTests.java b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/AssertOnOrphanedTests.java
index 90ada11..86115c8 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/AssertOnOrphanedTests.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/AssertOnOrphanedTests.java
@@ -23,7 +23,7 @@
  * Assert if Ignite repository contains some orphaned (non-suited) tests.
  */
 public class AssertOnOrphanedTests {
-    /** */
+    /** @param args Command line arguments. */
     public static void main(String[] args) throws Exception {
         OrphanedTestCollection orphanedTestCollection = new OrphanedTestCollection();
 
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
index 0d687f2..a61f7d4 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
@@ -52,7 +52,7 @@
     /** */
     private final ReporterFactory reporterFactory;
 
-    /** */
+    /** @param bootParams Provider parameters. */
     public IgniteTestsProvider(ProviderParameters bootParams) {
         testClsLdr = bootParams.getTestClassLoader();
         scanResult = bootParams.getScanResult();
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/OrphanedTestCollection.java b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/OrphanedTestCollection.java
index 3796117..cefee5b 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/OrphanedTestCollection.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/OrphanedTestCollection.java
@@ -42,7 +42,7 @@
     /** File to persist orphaned tests. */
     private final Path path = initPath();
 
-    /** */
+    /** @return {@link Set} of orphaned test names. */
     public Set<String> getOrphanedTests() throws Exception {
         if (Files.notExists(path))
             return new HashSet<>();
@@ -87,7 +87,7 @@
         }
     }
 
-    /** */
+    /** @return Path of the file to persist orphaned tests into. */
     public Path getPath() {
         return path;
     }
diff --git a/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPluginComponent.java b/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPluginComponent.java
index ef4713d..7e9a143 100644
--- a/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPluginComponent.java
+++ b/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPluginComponent.java
@@ -24,7 +24,7 @@
  */
 public interface VisorPluginComponent {
     /**
-     * Get component container.
-     **/
+     * @return Component container.
+     */
     public JComponent container();
 }
diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 22f881a..774b156 100644
--- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -131,6 +131,7 @@
         testImplicitlyModification("ignite-webapp-config.xml");
     }
 
+    /** */
     @Test
     public void testSessionCookie() throws Exception {
         testSessionCookie("/modules/core/src/test/config/websession/example-cache.xml");
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 3ddee81..ea9a84a 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@ -288,6 +288,7 @@
     @GridToStringInclude
     private int clientNodesAfterId = -1;
 
+    /** */
     @ParametersDelegate
     @GridToStringInclude
     public UploadBenchmarkArguments upload = new UploadBenchmarkArguments();
@@ -467,6 +468,7 @@
         return range;
     }
 
+    /** */
     public void setRange(int newVal) {
         range = newVal;
     }
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java
index 3e32c0b..db518fc 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/NativeJavaApiPutRemoveBenchmark.java
@@ -30,12 +30,14 @@
     /** Cache for created table. */
     private IgniteCache<Object, Object> tabCache;
 
+    /** {@inheritDoc} */
     @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
         super.setUp(cfg);
 
         tabCache = ignite().cache("SQL_PUBLIC_TEST_LONG");
     }
 
+    /** {@inheritDoc} */
     @Override public boolean test(Map<Object, Object> ctx) throws Exception {
         long insertKey = ThreadLocalRandom.current().nextLong(args.range()) + 1 + args.range();
         long insertVal = insertKey + 1;
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/SelectCommand.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/SelectCommand.java
index 468d073..7e18943 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/SelectCommand.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/SelectCommand.java
@@ -30,14 +30,17 @@
      * Creates SELECT query that has primary key field in the WHERE clause.
      */
     BY_PRIMARY_KEY {
+        /** {@inheritDoc} */
         @Override public String selectOne() {
             return "SELECT id, val FROM test_long WHERE id = ?;";
         }
 
+        /** {@inheritDoc} */
         @Override public String selectRange() {
             return "SELECT id, val FROM test_long WHERE id BETWEEN ? AND ?;";
         }
 
+        /** {@inheritDoc} */
         @Override public long fieldByPK(long pk) {
             // This command uses PK value itself.
             return pk;
@@ -48,14 +51,17 @@
      * Creates SELECT query that has value field in the WHERE clause.
      */
     BY_VALUE {
+        /** {@inheritDoc} */
         @Override public String selectOne() {
             return "SELECT id, val FROM test_long WHERE val = ?;";
         }
 
+        /** {@inheritDoc} */
         @Override public String selectRange() {
             return "SELECT id, val FROM test_long WHERE val BETWEEN ? AND ?;";
         }
 
+        /** {@inheritDoc} */
         @Override public long fieldByPK(long pk) {
             // data model defines that value is generated as id (PK) field plus one.
             return pk + 1;
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/UploadBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/UploadBenchmarkArguments.java
index 257437e..fe6f39e 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/UploadBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/UploadBenchmarkArguments.java
@@ -53,27 +53,33 @@
             "Additional url parameters (space separated key=value) for special JDBC connection that only uploads data. ")
     private List<String> uploadJdbcParams = Collections.emptyList();
 
+    /** */
     @Parameter(names = {"--sql-copy-packet-size"},
         description = "Upload benchmark only: use custom packet_size (in bytes) for copy command.")
     private Long copyPacketSize = null;
 
+    /** */
     @Parameter(names = {"--streamer-node-buf-size"},
         description = "Streamer benchmarks only: Set streamer's perNodeBufferSize property")
     private Integer streamerNodeBufSize = null;
 
+    /** */
     @Parameter(names = {"--streamer-node-par-ops"},
         description = "Streamer benchmarks only: Set streamer's perNodeParallelOperations property")
     private Integer streamerNodeParOps = null;
 
+    /** */
     @Parameter(names = {"--streamer-local-batch-size"},
         description = "Streamer benchmarks only: collect entries before passing to java streamer api." +
             "If set to 1, than entries will be passed directly.")
     private Integer streamerLocBatchSize = null;
 
+    /** */
     @Parameter(names = {"--streamer-allow-overwrite"}, arity = 1,
         description = "Streamer benchmarks only: set allowOverwrite streamer parameter.")
     private Boolean streamerAllowOverwrite = null;
 
+    /** */
     @Parameter(names = {"--streamer-ordered"}, arity = 1,
         description = "Streamer benchmarks only: set streamer ordered flag.")
     private boolean streamerOrdered = false;
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/model/Values10.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/model/Values10.java
index c6094d6..13110f4 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/model/Values10.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/model/Values10.java
@@ -73,6 +73,7 @@
         val10 = rnd.nextLong();
     }
 
+    /** */
     public Object[] toArgs(long id) {
         return new Object[] {id, val1, val2, val3, val4, val5, val6, val7, val8, val9, val10};
     }
diff --git a/modules/yarn/src/main/java/org/apache/ignite/yarn/ClusterProperties.java b/modules/yarn/src/main/java/org/apache/ignite/yarn/ClusterProperties.java
index deaf6ab..adf5554 100644
--- a/modules/yarn/src/main/java/org/apache/ignite/yarn/ClusterProperties.java
+++ b/modules/yarn/src/main/java/org/apache/ignite/yarn/ClusterProperties.java
@@ -184,6 +184,8 @@
 
     /**
      * Sets CPU count limit.
+     *
+     * @param cpu CPU per node count limit.
      */
     public void cpusPerNode(double cpu) {
         this.cpuPerNode = cpu;
@@ -237,6 +239,8 @@
 
     /**
      * Sets instance count limit.
+     *
+     * @param nodeCnt Node instance count limit.
      */
     public void instances(int nodeCnt) {
         this.nodeCnt = nodeCnt;
diff --git a/modules/yarn/src/main/java/org/apache/ignite/yarn/IgniteContainer.java b/modules/yarn/src/main/java/org/apache/ignite/yarn/IgniteContainer.java
index b0c0bf9..1e76f0e 100644
--- a/modules/yarn/src/main/java/org/apache/ignite/yarn/IgniteContainer.java
+++ b/modules/yarn/src/main/java/org/apache/ignite/yarn/IgniteContainer.java
@@ -39,6 +39,7 @@
     /**
      * Ignite launched task.
      *
+     * @param id Container ID.
      * @param nodeId Node id.
      * @param cpuCores Cpu cores count.
      * @param mem Memory
diff --git a/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/IgniteYarnUtils.java b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/IgniteYarnUtils.java
index 03952a9..345d032 100644
--- a/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/IgniteYarnUtils.java
+++ b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/IgniteYarnUtils.java
@@ -54,6 +54,7 @@
      * @param file Path.
      * @param fs File system.
      * @param type Local resource type.
+     * @return Resource file.
      * @throws Exception If failed.
      */
     public static LocalResource setupFile(Path file, FileSystem fs, LocalResourceType type)
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java
index c860f17..ad0821b 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java
@@ -357,7 +357,7 @@
     }
 
     /**
-     * * @return The value of this flag. See {@link #setAllowDuplicateRegistrations(boolean)} for more details.
+     * @return The value of this flag. See {@link #setAllowDuplicateRegistrations(boolean)} for more details.
      */
     public boolean isAllowDuplicateRegistrations() {
         return allowDuplicateRegistrations;
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDistributedCollectDataFuture.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDistributedCollectDataFuture.java
index e710055..58cadef 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDistributedCollectDataFuture.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDistributedCollectDataFuture.java
@@ -130,6 +130,7 @@
         client.createIfNeeded(futResPath, data, CreateMode.PERSISTENT);
     }
 
+    /** */
     static byte[] readResult(ZookeeperClient client, ZkIgnitePaths paths, UUID futId) throws Exception {
         return client.getData(paths.distributedFutureResultPath(futId));
     }
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkJoinEventDataForJoined.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkJoinEventDataForJoined.java
index e4ae4ba0..f47431c 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkJoinEventDataForJoined.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkJoinEventDataForJoined.java
@@ -51,6 +51,7 @@
         this.dupDiscoData = dupDiscoData;
     }
 
+    /** */
     byte[] discoveryDataForNode(long nodeOrder) {
         assert discoData != null;
 
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
index e98bc01..3ad70b1 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
@@ -1164,6 +1164,7 @@
             this.op = op;
         }
 
+        /** {@inheritDoc} */
         @Override public void processResult(int rc, String path, Object ctx, String name) {
             if (closing)
                 return;
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index d1b4623..6dd7f3a 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -2839,6 +2839,7 @@
             commErrFut.onTopologyChange(rtState.top); // This can add new event, notify out of event process loop.
     }
 
+    /** */
     private boolean processBulkJoin(ZkDiscoveryEventsData evtsData, ZkDiscoveryNodeJoinEventData evtData)
         throws Exception
     {
@@ -4431,6 +4432,7 @@
      * See {@link #cleanupPreviousClusterData}.
      */
     private class ClientLocalNodeWatcher extends PreviousNodeWatcher {
+        /** */
         final CheckJoinErrorWatcher joinErrorWatcher;
 
         /**
diff --git a/modules/zookeeper/src/test/java/org/apache/ZookeeperNodeStart.java b/modules/zookeeper/src/test/java/org/apache/ZookeeperNodeStart.java
index ef4d5f4..97a4706 100644
--- a/modules/zookeeper/src/test/java/org/apache/ZookeeperNodeStart.java
+++ b/modules/zookeeper/src/test/java/org/apache/ZookeeperNodeStart.java
@@ -25,6 +25,7 @@
  *
  */
 public class ZookeeperNodeStart {
+    /** */
     public static void main(String[] args) throws Exception {
         try {
             IgniteConfiguration cfg = new IgniteConfiguration();
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryRandomStopOrFailConcurrentTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryRandomStopOrFailConcurrentTest.java
index 0f9935b..dbefa79 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryRandomStopOrFailConcurrentTest.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryRandomStopOrFailConcurrentTest.java
@@ -256,9 +256,15 @@
         return res;
     }
 
+    /** */
     enum StopMode {
+        /** */
         STOP_ONLY,
+
+        /** */
         FAIL_ONLY,
+
+        /** */
         RANDOM
     }
 }
diff --git a/parent/pom.xml b/parent/pom.xml
index 98f9068..8e2c3f7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -109,7 +109,7 @@
         <lz4.version>1.5.0</lz4.version>
         <maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version>
         <maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
-        <checkstyle.puppycrawl.version>8.37</checkstyle.puppycrawl.version>
+        <checkstyle.puppycrawl.version>8.45</checkstyle.puppycrawl.version>
         <mockito.version>3.4.6</mockito.version>
         <mysql.connector.version>8.0.13</mysql.connector.version>
         <netlibjava.version>1.1.2</netlibjava.version>