ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] incubator-ignite git commit: [IGNITE-350]: fixed javadocs + other GG removals.
Date Thu, 26 Feb 2015 15:54:16 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-350 [created] cac335ba2


[IGNITE-350]: fixed javadocs + other GG removals.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d1eff009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d1eff009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d1eff009

Branch: refs/heads/ignite-350
Commit: d1eff0095c4433388aea27964aa6dc82588cb7a9
Parents: dd11f19
Author: iveselovskiy <iveselovskiy@gridgain.com>
Authored: Thu Feb 26 18:52:34 2015 +0300
Committer: iveselovskiy <iveselovskiy@gridgain.com>
Committed: Thu Feb 26 18:52:34 2015 +0300

----------------------------------------------------------------------
 .../processors/rest/TestBinaryClient.java       |   2 +-
 .../processors/rest/TestMemcacheClient.java     |   2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   4 +-
 .../main/java/org/apache/ignite/IgniteFs.java   |   2 +-
 .../CacheConsistentHashAffinityFunction.java    |   2 +-
 .../configuration/QueryConfiguration.java       |  12 +--
 .../java/org/apache/ignite/igfs/IgfsMode.java   |   6 +-
 .../java/org/apache/ignite/igfs/package.html    |   2 +-
 .../org/apache/ignite/internal/GridTopic.java   |  32 +++---
 .../affinity/GridAffinityMessage.java           |   4 +-
 .../processors/cache/CacheInvokeResult.java     |   4 +-
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../cache/GridCacheDeploymentManager.java       |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   2 +-
 .../processors/cache/GridCacheReturn.java       |   4 +-
 .../cache/GridCacheWriteBehindStore.java        |   2 +-
 .../IgniteExternalizableExpiryPolicy.java       |   4 +-
 .../cache/query/GridCacheQueryRequest.java      |   2 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   4 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   4 +-
 .../cache/transactions/IgniteTxEntry.java       |   4 +-
 .../cache/version/GridCacheVersion.java         |   4 +-
 .../cache/version/GridCacheVersionEx.java       |   4 +-
 .../datastructures/GridCacheSetImpl.java        |   2 +-
 .../streamer/GridStreamerExecutionBatch.java    |   4 +-
 .../ignite/internal/util/IgniteUtils.java       |   2 +
 .../java/org/apache/ignite/lang/IgniteUuid.java |   4 +-
 .../optimized/OptimizedMarshallable.java        |  12 +--
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   2 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   2 +-
 .../processors/cache/GridCacheTestEntryEx.java  | 108 +++++++++----------
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   2 +-
 .../GridCacheModuloAffinityFunction.java        |   2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   2 +-
 .../near/GridCacheNearMetricsSelfTest.java      |   2 +-
 .../GridCachePartitionedEvictionSelfTest.java   |   2 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |   2 +-
 .../optimized/OptimizedMarshallerSelfTest.java  |   6 +-
 .../client/hadoop/GridHadoopClientProtocol.java |   6 +-
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |   2 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |   2 +-
 .../java/org/apache/ignite/igfs/package.html    |   2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |   4 +-
 .../hadoop/GridHadoopClassLoader.java           |   2 +-
 .../processors/hadoop/GridHadoopUtils.java      |   4 +-
 .../collections/GridHadoopHashMultimapBase.java |   2 +-
 .../GridHadoopExternalCommunication.java        |  12 ++-
 .../hadoop/v1/GridHadoopV1MapTask.java          |  10 +-
 .../v2/GridHadoopV2JobResourceManager.java      |   2 +-
 .../hadoop/GridHadoopGroupingTest.java          |   4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |   1 -
 .../apache/ignite/visor/plugin/VisorPlugin.java |   2 +-
 52 files changed, 169 insertions(+), 156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
index 2774947..7a23a2a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
@@ -201,7 +201,7 @@ final class TestBinaryClient {
         rdr.start();
     }
 
-    /** {@inheritDoc} */
+    /**  */
     public void shutdown() throws IgniteCheckedException {
         try {
             if (rdr != null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java
----------------------------------------------------------------------
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 5f4ae8f..c9763c3 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
@@ -243,7 +243,7 @@ final class TestMemcacheClient {
         rdr.start();
     }
 
-    /** {@inheritDoc} */
+    /**  */
     public void shutdown() throws IgniteCheckedException {
         try {
             if (rdr != null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
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 a120701..8851d8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -37,7 +37,7 @@ import java.util.concurrent.*;
  * each instance a different name.
  * <p>
  * Note that {@code Grid} extends {@link ClusterGroup} which means that it provides grid projection
- * functionality over the whole grid (instead os a subgroup of nodes).
+ * functionality over the whole grid (instead of a subgroup of nodes).
  * <p>
  * In addition to {@link ClusterGroup} functionality, from here you can get the following:
  * <ul>
@@ -159,7 +159,7 @@ public interface Ignite extends AutoCloseable {
      * Creates new {@link ExecutorService} which will execute all submitted
      * {@link java.util.concurrent.Callable} and {@link Runnable} jobs on nodes in this grid projection.
      * This essentially
-     * creates a <b><i>Distributed Thread Pool</i</b> that can be used as a
+     * creates a <b><i>Distributed Thread Pool</i></b> that can be used as a
      * replacement for local thread pools.
      *
      * @return Grid-enabled {@code ExecutorService}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
index 044c03b..dc11973 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 /**
- * <b>G</b>rid<b>G</b>ain <b>F</b>ile <b>S</b>ystem API. It provides a typical file system "view" on a particular cache:
+ * <b>IG</b>nite <b>F</b>ile <b>S</b>ystem API. It provides a typical file system "view" on a particular cache:
  * <ul>
  *     <li>list directories or get information for a single path</li>
  *     <li>create/move/delete files or directories</li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java
index 095f413..44ef72a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/consistenthash/CacheConsistentHashAffinityFunction.java
@@ -572,7 +572,7 @@ public class CacheConsistentHashAffinityFunction implements CacheAffinityFunctio
         return nodeInfo;
     }
 
-    /** {@inheritDoc} */
+    /** */
     private void initialize() {
         if (!init.get() && init.compareAndSet(false, true)) {
             if (log.isInfoEnabled())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
index 98b0f6f..0bb0600 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
@@ -76,7 +76,7 @@ public class QueryConfiguration {
         this.maxOffHeapMemory = maxOffHeapMemory;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     public long getMaxOffHeapMemory() {
         return maxOffHeapMemory;
     }
@@ -103,12 +103,12 @@ public class QueryConfiguration {
         this.searchPath = searchPath;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     @Nullable public String[] getSearchPath() {
         return searchPath;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     @Nullable public String getInitialScriptPath() {
         return initScriptPath;
     }
@@ -133,12 +133,12 @@ public class QueryConfiguration {
         this.idxCustomFuncClss = idxCustomFuncClss;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     @Nullable public Class<?>[] getIndexCustomFunctionClasses() {
         return idxCustomFuncClss;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     public long getLongQueryExecutionTimeout() {
         return longQryExecTimeout;
     }
@@ -157,7 +157,7 @@ public class QueryConfiguration {
         this.longQryExecTimeout = longQryExecTimeout;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     public boolean isLongQueryExplain() {
         return longQryExplain;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
index 5c5aa57..3c440ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
@@ -39,7 +39,7 @@ public enum IgfsMode {
      * through to secondary Hadoop file system. If this mode is enabled, then
      * secondary Hadoop file system must be configured.
      *
-     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
      */
     PROXY,
 
@@ -50,7 +50,7 @@ public enum IgfsMode {
      * If secondary Hadoop file system is not configured, then this mode behaves like
      * {@link #PRIMARY} mode.
      *
-     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
      */
     DUAL_SYNC,
 
@@ -61,7 +61,7 @@ public enum IgfsMode {
      * If secondary Hadoop file system is not configured, then this mode behaves like
      * {@link #PRIMARY} mode.
      *
-     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
      */
     DUAL_ASYNC;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/igfs/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/package.html b/modules/core/src/main/java/org/apache/ignite/igfs/package.html
index c08c784..ec38a21 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/package.html
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/package.html
@@ -19,6 +19,6 @@
 <html>
 <body>
     <!-- Package description. -->
-    Contains <b>G</b>rid<b>G</b>ain <b>F</b>ile <b>S</b>ystem APIs.
+    Contains <b>IG</b>nite <b>F</b>ile <b>S</b>ystem APIs.
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
index 32bab16..9d60349 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
@@ -192,7 +192,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -218,7 +218,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */
@@ -264,7 +264,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -295,7 +295,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */
@@ -343,7 +343,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -385,7 +385,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */
@@ -415,7 +415,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -451,7 +451,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */
@@ -501,7 +501,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -537,7 +537,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */
@@ -587,7 +587,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -618,7 +618,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */
@@ -666,7 +666,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -707,7 +707,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */
@@ -760,7 +760,7 @@ public enum GridTopic {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private GridTopic topic;
@@ -791,7 +791,7 @@ public enum GridTopic {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
index 016a792..59a75c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java
@@ -36,7 +36,7 @@ class GridAffinityMessage implements Externalizable, OptimizedMarshallable {
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** */
     private byte[] src;
@@ -131,7 +131,7 @@ class GridAffinityMessage implements Externalizable, OptimizedMarshallable {
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
index 3eb0f5a..c3caf21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
@@ -33,7 +33,7 @@ public class CacheInvokeResult<T> implements EntryProcessorResult<T>, Externaliz
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "JavaAbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** */
     @GridToStringInclude
@@ -65,7 +65,7 @@ public class CacheInvokeResult<T> implements EntryProcessorResult<T>, Externaliz
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
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 12ea535..d34c213 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
@@ -929,7 +929,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         return peek0(key, modes, ctx.tm().localTxx());
     }
 
-    /** {@inheritDoc} */
+    /** */
     public Map<K, V> peekAll(@Nullable Collection<? extends K> keys,
         @Nullable IgnitePredicate<Cache.Entry<K, V>>... filter) {
         return peekAll0(keys, filter, null);
@@ -1376,7 +1376,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         return values((IgnitePredicate<Cache.Entry<K, V>>[])null);
     }
 
-    /** {@inheritDoc} */
+    /** */
     public Collection<V> values(IgnitePredicate<Cache.Entry<K, V>>... filter) {
         return map.values(filter);
     }
@@ -2059,7 +2059,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         return res;
     }
 
-    /** {@inheritDoc} */
+    /** */
     protected IgniteInternalFuture<Map<K, V>> getAllAsync(
         @Nullable Collection<? extends K> keys,
         boolean forcePrimary,
@@ -2086,7 +2086,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             skipVals);
     }
 
-    /** {@inheritDoc} */
+    /**  */
     public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys,
         boolean readThrough,
         @Nullable GridCacheEntryEx<K, V> cached,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
----------------------------------------------------------------------
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 c9467eb..cfc0528 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
@@ -609,7 +609,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
                     if (curLdr.equals(ldr))
                         break;
 
-                    // If current deployment is either system loader or GG loader,
+                    // If current deployment is either system loader or Ignite loader,
                     // then we don't check it, as new loader is most likely wider.
                     if (!curLdr.equals(U.gridClassLoader()) && dep.deployedClass(cls.getName()) != null)
                         // Local deployment can load this class already, so no reason

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index db7272b..751315f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -650,7 +650,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
             expirePlc);
     }
 
-    /** {@inheritDoc} */
+    /**  */
     @SuppressWarnings({"unchecked", "RedundantTypeArguments", "TooBroadScope"})
     private V innerGet0(IgniteInternalTx<K, V> tx,
         boolean readSwap,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
index 3e9047c..d65bddb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
@@ -35,7 +35,7 @@ public class GridCacheReturn<V> implements Externalizable, OptimizedMarshallable
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "JavaAbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** Value. */
     @GridToStringInclude
@@ -202,7 +202,7 @@ public class GridCacheReturn<V> implements Externalizable, OptimizedMarshallable
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
index eb6120a..5dbd8a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
@@ -702,7 +702,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy
      * Thread that performs time-based flushing of written values to the underlying storage.
      */
     private class Flusher extends GridWorker {
-        /** {@inheritDoc */
+        /**  */
         protected Flusher(String gridName, String name, IgniteLogger log) {
             super(gridName, name, log);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
index f4caaca..02c07ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/IgniteExternalizableExpiryPolicy.java
@@ -34,7 +34,7 @@ public class IgniteExternalizableExpiryPolicy implements ExpiryPolicy, Externali
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** */
     private ExpiryPolicy plc;
@@ -75,7 +75,7 @@ public class IgniteExternalizableExpiryPolicy implements ExpiryPolicy, Externali
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index f045d0c..51a8ed3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -372,7 +372,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
         return keyValFilter;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     public IgnitePredicate<Cache.Entry<Object, Object>> projectionFilter() {
         return prjFilter;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index fee601b..4f98262 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -73,7 +73,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** Cache name. */
         private final String cacheName;
@@ -95,7 +95,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 4c6f8e4..25c30bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -143,7 +143,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
 
         /** */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** Arguments. */
         private final Map<String, Object> args;
@@ -173,7 +173,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index eb184c9..01c60af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -50,7 +50,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** Owning transaction. */
     @GridToStringExclude
@@ -902,7 +902,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable,
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index 8c37f5a..6704425 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -35,7 +35,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** Node order mask. */
     private static final int NODE_ORDER_MASK = 0x07_FF_FF_FF;
@@ -187,7 +187,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index 9a6cbd2..67a9249 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -28,7 +28,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** DR version. */
     private GridCacheVersion drVer;
@@ -83,7 +83,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index 5d96086..bf39f96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -340,7 +340,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements Ignite
         }
     }
 
-    /** {@inheritDoc} */
+    /**  */
     @SuppressWarnings("unchecked")
     private GridCloseableIterator<T> iterator0() {
         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
index 770fcc2..fd46994 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionBatch.java
@@ -36,7 +36,7 @@ public class GridStreamerExecutionBatch implements Externalizable, OptimizedMars
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** Execution ID (ID of root future). */
     private IgniteUuid execId;
@@ -155,7 +155,7 @@ public class GridStreamerExecutionBatch implements Externalizable, OptimizedMars
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index b9c7596..0997297 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -8168,6 +8168,7 @@ public abstract class IgniteUtils {
     /**
      * @param userWorkDir Ignite work folder provided by user.
      * @param userIgniteHome Ignite home folder provided by user.
+     * @throws IgniteCheckedException 
      */
     public static void setWorkDirectory(@Nullable String userWorkDir, @Nullable String userIgniteHome)
         throws IgniteCheckedException {
@@ -8819,6 +8820,7 @@ public abstract class IgniteUtils {
      *
      * @param cond Assertion condition to check.
      * @param condDesc Description of failed condition.
+     * @throws IgniteException 
      */
     public static void assertParameter(boolean cond, String condDesc) throws IgniteException {
         if (!cond)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
index cb622d9..de7a0c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
@@ -38,7 +38,7 @@ public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<Ignite
 
     /** */
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-    private static Object GG_CLASS_ID;
+    private static Object IGNITE_CLASS_ID;
 
     /** VM ID. */
     public static final UUID VM_ID = UUID.randomUUID();
@@ -158,7 +158,7 @@ public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<Ignite
 
     /** {@inheritDoc} */
     @Override public Object ggClassId() {
-        return GG_CLASS_ID;
+        return IGNITE_CLASS_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallable.java
index 729b062..b73d027 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallable.java
@@ -27,11 +27,11 @@ import java.util.*;
  * <ul>
  * <li>
  *     Must have static filed (private or public) declared of type {@link Object}
- *     with name {@code GG_CLASS_ID}. Ignite will reflectively initialize this field with
+ *     with name {@code IGNITE_CLASS_ID}. Ignite will reflectively initialize this field with
  *     proper class ID during system startup.
  * </li>
  * <li>
- *     Must return the value of {@code GG_CLASS_ID} field from {@link #ggClassId} method.
+ *     Must return the value of {@code IGNITE_CLASS_ID} field from {@link #ggClassId} method.
  * </li>
  * </ul>
  * Here is a sample implementation:
@@ -39,12 +39,12 @@ import java.util.*;
  * // For better performance consider implementing java.io.Externalizable interface.
  * class ExampleMarshallable implements GridOptimizedMarshallable, Serializable {
  *     // Class ID field required by 'GridOptimizedMarshallable'.
- *     private static Object GG_CLASS_ID;
+ *     private static Object IGNITE_CLASS_ID;
  *
  *     ...
  *
  *     &#64; public Object ggClassId() {
- *         return GG_CLASS_ID;
+ *         return IGNITE_CLASS_ID;
  *     }
  * }
  * </pre>
@@ -54,10 +54,10 @@ import java.util.*;
  */
 public interface OptimizedMarshallable {
     /** */
-    public static final String CLS_ID_FIELD_NAME = "GG_CLASS_ID";
+    public static final String CLS_ID_FIELD_NAME = "IGNITE_CLASS_ID";
 
     /**
-     * Implementation of this method should simply return value of {@code GG_CLASS_ID} field.
+     * Implementation of this method should simply return value of {@code IGNITE_CLASS_ID} field.
      *
      * @return Class ID for optimized marshalling.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
----------------------------------------------------------------------
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 9f4b8f2..03fc991 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
@@ -149,7 +149,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS
             return res;
         }
 
-        /** {@inheritDoc} */
+        /**  */
         public List<ClusterNode> nodes(int part, Collection<ClusterNode> nodes) {
             return new ArrayList<>(nodes);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 5d08746..ab6c6df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -57,7 +57,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
         return PARTITIONED_ONLY;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     protected boolean portableEnabled() {
         return false;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index b5e226f..39744ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -302,7 +302,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return true;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public K key() {
         return key;
     }
@@ -312,7 +312,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return new IgniteTxKey<>(key, 0);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public V rawGet() {
         return val;
     }
@@ -327,7 +327,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return val != null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public V rawPut(V val, long ttl) {
         V old = this.val;
 
@@ -337,12 +337,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return old;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public Cache.Entry<K, V> wrap() {
         assert false; return null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public Cache.Entry<K, V> wrapLazyValue() {
         assert false; return null;
     }
@@ -357,12 +357,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         assert false; return null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheVersion obsoleteVersion() {
         return obsoleteVer;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean obsolete() {
         return obsoleteVer != null;
     }
@@ -372,25 +372,25 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return obsoleteVer != null && !obsoleteVer.equals(exclude);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean invalidate(@Nullable GridCacheVersion curVer, GridCacheVersion newVer)
         throws IgniteCheckedException {
         assert false; return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean invalidate(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException {
         assert false; return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean compact(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter)
         throws GridCacheEntryRemovedException, IgniteCheckedException {
         assert false;  return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer,
         @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         assert false; return false;
@@ -402,7 +402,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         assert false; return null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean isNew() {
         assert false; return false;
     }
@@ -412,7 +412,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         assert false; return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public V innerGet(@Nullable IgniteInternalTx<K, V> tx,
         boolean readSwap,
         boolean readThrough,
@@ -428,12 +428,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return val;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public V innerReload() {
         return val;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheUpdateTxResult<V> innerSet(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, UUID affNodeId,
         @Nullable V val, @Nullable byte[] valBytes, boolean writeThrough, boolean retval, long ttl,
         boolean evt, boolean metrics, long topVer, IgnitePredicate<Cache.Entry<K, V>>[] filter, GridDrType drType,
@@ -497,7 +497,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
             true);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheUpdateTxResult<V> innerRemove(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId,
         UUID affNodeId, boolean writeThrough, boolean retval, boolean evt, boolean metrics, long topVer,
         IgnitePredicate<Cache.Entry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId,
@@ -512,7 +512,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return new GridCacheUpdateTxResult<>(true, old);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean clear(GridCacheVersion ver, boolean readers,
         @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) throws IgniteCheckedException {
         if (ver == null || ver.equals(this.ver)) {
@@ -524,17 +524,17 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean tmLock(IgniteInternalTx<K, V> tx, long timeout) {
         assert false; return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public void txUnlock(IgniteInternalTx<K, V> tx) {
         assert false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean removeLock(GridCacheVersion ver) {
         GridCacheMvccCandidate<K> doomed = mvcc.candidate(ver);
 
@@ -543,7 +543,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return doomed != null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean markObsolete(GridCacheVersion ver) {
         if (ver == null || ver.equals(obsoleteVer)) {
             obsoleteVer = ver;
@@ -580,40 +580,40 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public byte[] keyBytes() {
         assert false; return null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public byte[] getOrMarshalKeyBytes() {
         assert false; return null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheVersion version() {
         return ver;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public V peek(GridCachePeekMode mode, IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         return val;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode,
         IgnitePredicate<Cache.Entry<K, V>>[] filter, IgniteInternalTx<K, V> tx)
         throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException {
         return F.t(val);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<Cache.Entry<K, V>>[] filter)
         throws GridCacheEntryRemovedException {
         return val;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public V peekFailFast(GridCachePeekMode mode,
         IgnitePredicate<Cache.Entry<K, V>>[] filter) {
         assert false; return null;
@@ -628,44 +628,44 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return old;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean initialValue(V val, @Nullable byte[] valBytes, GridCacheVersion ver, long ttl,
         long expireTime, boolean preload, long topVer, GridDrType drType) throws IgniteCheckedException,
         GridCacheEntryRemovedException {
         assert false; return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean initialValue(K key, GridCacheSwapEntry<V> unswapped) {
         assert false; return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheVersionedEntryEx<K, V> versionedEntry() throws IgniteCheckedException {
         return null;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean versionedValue(V val, GridCacheVersion curVer, GridCacheVersion newVer) {
         assert false; return false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean hasLockCandidate(GridCacheVersion ver) {
         return mvcc.hasCandidate(ver);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedByAny(GridCacheVersion... exclude) {
         return !mvcc.isEmpty(exclude);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedByThread()  {
         return lockedByThread(Thread.currentThread().getId());
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedLocally(GridCacheVersion lockVer) {
         return mvcc.isLocallyOwned(lockVer);
     }
@@ -676,52 +676,52 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return lockedLocally(lockVer) || lockedByThread(threadId);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedByThread(long threadId, GridCacheVersion exclude) {
         return mvcc.isLocallyOwnedByThread(threadId, false, exclude);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedByThread(long threadId) {
         return mvcc.isLocallyOwnedByThread(threadId, true);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedBy(GridCacheVersion ver) {
         return mvcc.isOwnedBy(ver);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedByThreadUnsafe(long threadId) {
         return mvcc.isLocallyOwnedByThread(threadId, true);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedByUnsafe(GridCacheVersion ver) {
         return mvcc.isOwnedBy(ver);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean lockedLocallyUnsafe(GridCacheVersion lockVer) {
         return mvcc.isLocallyOwned(lockVer);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public boolean hasLockCandidateUnsafe(GridCacheVersion ver) {
         return mvcc.hasCandidate(ver);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public Collection<GridCacheMvccCandidate<K>> localCandidates(GridCacheVersion... exclude) {
         return mvcc.localCandidates(exclude);
     }
 
-    /** @inheritDoc */
+    /**  */
     public Collection<GridCacheMvccCandidate<K>> localCandidates(boolean reentries, GridCacheVersion... exclude) {
         return mvcc.localCandidates(reentries, exclude);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public Collection<GridCacheMvccCandidate<K>> remoteMvccSnapshot(GridCacheVersion... exclude) {
         return mvcc.remoteCandidates(exclude);
     }
@@ -731,7 +731,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return mvcc.localCandidate(threadId);
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheMvccCandidate<K> candidate(GridCacheVersion ver) {
         return mvcc.candidate(ver);
     }
@@ -749,22 +749,22 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return mvcc.anyOwner();
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheMvccCandidate<K> localOwner() {
         return mvcc.localOwner();
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public void keyBytes(byte[] keyBytes) {
         assert false;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheValueBytes valueBytes() {
         assert false; return GridCacheValueBytes.nil();
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public GridCacheValueBytes valueBytes(GridCacheVersion ver) {
         assert false; return GridCacheValueBytes.nil();
     }
@@ -774,7 +774,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return 0;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public long expireTime() {
         return 0;
     }
@@ -794,12 +794,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme
         return ttl;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public long ttl() {
         return ttl;
     }
 
-    /** @inheritDoc */
+    /** {@inheritDoc} */
     @Override public void updateTtl(GridCacheVersion ver, long ttl) {
         throw new UnsupportedOperationException();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index c0f4200..b16b55e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -80,7 +80,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
         return c;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     protected CacheConfiguration cacheConfiguration() {
         CacheConfiguration cc = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java
index 5f07043..cc1a891 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheModuloAffinityFunction.java
@@ -99,7 +99,7 @@ public class GridCacheModuloAffinityFunction implements CacheAffinityFunction {
         return Collections.unmodifiableList(res);
     }
 
-    /** {@inheritDoc} */
+    /** */
     public Collection<ClusterNode> nodes(int part, Collection<ClusterNode> nodes) {
         List<ClusterNode> sorted = new ArrayList<>(nodes);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 173940d..4f763b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -78,7 +78,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
         return cfg;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     protected CacheConfiguration cacheConfiguration() {
         CacheConfiguration ccfg = new CacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
index 2c52928..7df5a40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
@@ -42,7 +42,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
         return false;
     }
 
-    /** {@inheritDoc} */
+    /**  */
     protected boolean perEntryMetricsEnabled() {
         return true;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index 13a7771..cba5d89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -153,9 +153,9 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT
     }
 
     /**
-     * @throws Exception If failed.
      * @param concurrency Tx concurrency.
      * @param isolation Tx isolation.
+     * @throws Exception If failed.
      */
     private void doTestEviction(TransactionConcurrency concurrency, TransactionIsolation isolation)
         throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 969692e..fa2c63e 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
@@ -552,7 +552,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
             return res;
         }
 
-        /** {@inheritDoc} */
+        /**  */
         @SuppressWarnings({"RedundantTypeArguments"})
         public List<ClusterNode> nodes(int part, Collection<ClusterNode> nodes) {
             Collection<ClusterNode> col = new HashSet<>(nodes);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSelfTest.java
index f2639a4..139e6aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSelfTest.java
@@ -357,7 +357,7 @@ public class OptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
     public static class GoodMarshallable implements OptimizedMarshallable, Serializable {
         /** Class ID required by {@link OptimizedMarshallable}. */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /** */
         private String str;
@@ -390,7 +390,7 @@ public class OptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Object ggClassId() {
-            return GG_CLASS_ID;
+            return IGNITE_CLASS_ID;
         }
     }
 
@@ -434,7 +434,7 @@ public class OptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
     private static class BadMarshallable extends TestObject implements OptimizedMarshallable {
         /** Class ID required by {@link OptimizedMarshallable}. */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
+        private static Object IGNITE_CLASS_ID;
 
         /**
          * @param str String.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index b058961..1a70593 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -57,7 +57,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
     /** Configuration. */
     private final Configuration conf;
 
-    /** GG client. */
+    /** Ignite client. */
     private volatile GridClient cli;
 
     /** Last received version. */
@@ -70,7 +70,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
      * Constructor.
      *
      * @param conf Configuration.
-     * @param cli GG client.
+     * @param cli Ignite client.
      */
     GridHadoopClientProtocol(Configuration conf, GridClient cli) {
         assert cli != null;
@@ -311,7 +311,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
     /**
      * Process received status update.
      *
-     * @param status GG status.
+     * @param status Hadoop map-reduce job status.
      * @return Hadoop status.
      */
     private JobStatus processStatus(GridHadoopJobStatus status) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
index 8762d83..91063cd 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
@@ -227,7 +227,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
             if (seqReadsBeforePrefetch > 0)
                 seqReadsBeforePrefetchOverride = true;
 
-            // In GG replication factor is controlled by data cache affinity.
+            // In Ignite replication factor is controlled by data cache affinity.
             // We use replication factor to force the whole file to be stored on local node.
             dfltReplication = (short)cfg.getInt("dfs.replication", 3);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
index a38178c..c3687cd 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
@@ -223,7 +223,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
             if (seqReadsBeforePrefetch > 0)
                 seqReadsBeforePrefetchOverride = true;
 
-            // In GG replication factor is controlled by data cache affinity.
+            // In Ignite replication factor is controlled by data cache affinity.
             // We use replication factor to force the whole file to be stored on local node.
             dfltReplication = (short)cfg.getInt("dfs.replication", 3);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/igfs/package.html
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/package.html b/modules/hadoop/src/main/java/org/apache/ignite/igfs/package.html
index c08c784..ec38a21 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/package.html
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/package.html
@@ -19,6 +19,6 @@
 <html>
 <body>
     <!-- Package description. -->
-    Contains <b>G</b>rid<b>G</b>ain <b>F</b>ile <b>S</b>ystem APIs.
+    Contains <b>IG</b>nite <b>F</b>ile <b>S</b>ystem APIs.
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
index f8bf1ae..bd96e60 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
@@ -87,7 +87,7 @@ public class IgfsHadoopUtils {
     }
 
     /**
-     * Cast GG exception to appropriate IO exception.
+     * Cast Ignite exception to appropriate IO exception.
      *
      * @param e Exception to cast.
      * @return Casted exception.
@@ -97,7 +97,7 @@ public class IgfsHadoopUtils {
     }
 
     /**
-     * Cast GG exception to appropriate IO exception.
+     * Cast Ignite exception to appropriate IO exception.
      *
      * @param e Exception to cast.
      * @param path Path for exceptions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
index 11f8358..4a81bba 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
@@ -100,7 +100,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
                 return loadClassExplicitly(name, resolve);
             }
 
-            if (isIgfsOrGgHadoop(name)) { // For GG Hadoop and IGFS classes we have to check if they depend on Hadoop.
+            if (isIgfsOrGgHadoop(name)) { // For Ignite Hadoop and IGFS classes we have to check if they depend on Hadoop.
                 Boolean hasDeps = cache.get(name);
 
                 if (hasDeps == null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
index b94b561..763f45a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
@@ -98,9 +98,9 @@ public class GridHadoopUtils {
     }
 
     /**
-     * Convert GG job status to Hadoop job status.
+     * Convert Ignite job status to Hadoop job status.
      *
-     * @param status GG job status.
+     * @param status Ignite job status.
      * @return Hadoop job status.
      */
     public static JobStatus status(GridHadoopJobStatus status, Configuration conf) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
index f7e1362..92854f1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
@@ -160,8 +160,8 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
         private final Reader valReader;
 
         /**
-         * @throws IgniteCheckedException If failed.
          * @param taskCtx Task context.
+         * @throws IgniteCheckedException If failed.
          */
         public Input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
             cap = capacity();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
index 6726bab..f4be0b1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
@@ -45,7 +45,7 @@ import java.util.concurrent.*;
 public class GridHadoopExternalCommunication {
     /** IPC error message. */
     public static final String OUT_OF_RESOURCES_TCP_MSG = "Failed to allocate shared memory segment " +
-        "(switching to TCP, may be slower)."; // todo IGNITE-70 Add link to documentation
+        "(switching to TCP, may be slower)."; // TODO IGNITE-70 Add link to documentation
 
     /** Default port which node sets listener to (value is <tt>47100</tt>). */
     public static final int DFLT_PORT = 27100;
@@ -687,6 +687,10 @@ public class GridHadoopExternalCommunication {
             locPort + ", portRange=" + locPortRange + ", locHost=" + locHost + ']', lastEx);
     }
 
+    /**
+     * Stops the server.
+     * @throws IgniteCheckedException
+     */
     public void stop() throws IgniteCheckedException {
         // Stop TCP server.
         if (nioSrvr != null)
@@ -710,6 +714,12 @@ public class GridHadoopExternalCommunication {
         boundTcpPort = -1;
     }
 
+    /**
+     * Sends message to Hadoop process.
+     * @param desc
+     * @param msg
+     * @throws IgniteCheckedException
+     */
     public void sendMessage(GridHadoopProcessDescriptor desc, GridHadoopMessage msg) throws
         IgniteCheckedException {
         assert desc != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
index 16c2b8c..f8138d6 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
@@ -31,7 +31,9 @@ public class GridHadoopV1MapTask extends GridHadoopV1Task {
     /** */
     private static final String[] EMPTY_HOSTS = new String[0];
 
-    /** {@inheritDoc} */
+    /** 
+     * @param taskInfo 
+     */
     public GridHadoopV1MapTask(GridHadoopTaskInfo taskInfo) {
         super(taskInfo);
     }
@@ -45,7 +47,7 @@ public class GridHadoopV1MapTask extends GridHadoopV1Task {
 
         JobConf jobConf = ctx.jobConf();
 
-        InputFormat inFormat = jobConf.getInputFormat();
+        InputFormat<Object,Object> inFormat = jobConf.getInputFormat();
 
         GridHadoopInputSplit split = info().inputSplit();
 
@@ -69,9 +71,9 @@ public class GridHadoopV1MapTask extends GridHadoopV1Task {
             collector = collector(jobConf, ctx, !job.info().hasCombiner() && !job.info().hasReducer(),
                 fileName(), ctx.attemptId());
 
-            RecordReader reader = inFormat.getRecordReader(nativeSplit, jobConf, reporter);
+            RecordReader<Object,Object> reader = inFormat.getRecordReader(nativeSplit, jobConf, reporter);
 
-            Mapper mapper = ReflectionUtils.newInstance(jobConf.getMapperClass(), jobConf);
+            Mapper<Object,Object, Object,Object> mapper = ReflectionUtils.newInstance(jobConf.getMapperClass(), jobConf);
 
             Object key = reader.createKey();
             Object val = reader.createValue();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
index b288089..be619c7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
@@ -73,8 +73,8 @@ public class GridHadoopV2JobResourceManager {
     /**
      * Set working directory in local file system.
      *
-     * @throws IOException If fails.
      * @param dir Working directory.
+     * @throws IOException If fails.
      */
     private void setLocalFSWorkingDirectory(File dir) throws IOException {
         JobConf cfg = ctx.getJobConf();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
index 7f56995..49099fc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
@@ -144,12 +144,12 @@ public class GridHadoopGroupingTest extends GridHadoopAbstractSelfTest {
     }
 
     public static class YearComparator implements RawComparator<YearTemperature> { // Grouping comparator.
-        /** {@inheritDoc */
+        /** {@inheritDoc} */
         @Override public int compare(YearTemperature o1, YearTemperature o2) {
             return Integer.compare(o1.year, o2.year);
         }
 
-        /** {@inheritDoc */
+        /** {@inheritDoc} */
         @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
             throw new IllegalStateException();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
index 7b54561..3908d67 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
@@ -202,7 +202,6 @@ public class IgfsPerformanceBenchmark {
         return args[idx];
     }
 
-    /** {@inheritDoc} */
     private static FileSystem igfs(Path home, String cfgPath) throws IOException {
         Configuration cfg = new Configuration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1eff009/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java b/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
index 384053d..34bcb90 100644
--- a/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
+++ b/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
@@ -23,7 +23,7 @@ import ro.fortsoft.pf4j.*;
  * Base class for Visor plugins.
  */
 public abstract class VisorPlugin extends Plugin {
-    /** {@inheritDoc} */
+    /** */
     public VisorPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }


Mime
View raw message